---

nikomatsakis · nikomatsakis · commit e56467b4974c · 2014-05-06T18:00:50.000-04:00
yaml --- r: 113913 b: refs/heads/master c: 683d664 h: refs/heads/master i: 113911: 9107537 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5f48cb6203bc425b0b605436d68dbbdbed53540a
+refs/heads/master: 683d6646cec22312ed643711eb8d909f96561fde
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
 refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17
diff --git a/trunk/src/test/compile-fail/typeck_type_placeholder_mismatch.rs b/trunk/src/test/compile-fail/typeck_type_placeholder_mismatch.rs
@@ -26,5 +26,4 @@ fn test1() {
 fn test2() {
     let x: Foo<_> = Bar::<uint>;
     //~^ ERROR mismatched types: expected `Foo<<generic #0>>` but found `Bar<uint>`
-    //~^^ ERROR cannot determine a type for this local variable: unconstrained type
 }

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,4 @@ fn test1() {`
`26`	`26`	`fn test2() {`
`27`	`27`	`let x: Foo<_> = Bar::<uint>;`
`28`	`28`	//~^ ERROR mismatched types: expected `Foo<<generic #0>>` but found `Bar<uint>`
`29`		`- //~^^ ERROR cannot determine a type for this local variable: unconstrained type`
`30`	`29`	`}`