---

pcwalton · pcwalton · commit 96b85ee90700 · 2012-08-15T16:51:51.000-07:00
yaml --- r: 27839 b: refs/heads/try c: e1b11aa h: refs/heads/master i: 27837: 8b18ad2 27835: d47f82e 27831: 81f13da 27823: 7251714 27807: aff22a7 27775: 962ecb3 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 6319c8fbc4840e02ee325c6c10bd487ef06518fb
+refs/heads/try: e1b11aaf4b44152317e1607a959100c12bf24c54
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
diff --git a/branches/try/src/test/compile-fail/map-types.rs b/branches/try/src/test/compile-fail/map-types.rs
@@ -6,7 +6,7 @@ import std::map::map;
 // Test that trait types printed in error msgs include the type arguments.
 
 fn main() {
-    let x: map<~str,~str> = map::str_hash::<~str>() as @map::<~str,~str>;
+    let x: map<~str,~str> = map::str_hash::<~str>() as map::<~str,~str>;
     let y: map<uint,~str> = x;
     //~^ ERROR mismatched types: expected `@std::map::map<uint,~str>`
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import std::map::map;`
`6`	`6`	`// Test that trait types printed in error msgs include the type arguments.`
`7`	`7`
`8`	`8`	`fn main() {`
`9`		`- let x: map<~str,~str> = map::str_hash::<~str>() as @map::<~str,~str>;`
	`9`	`+ let x: map<~str,~str> = map::str_hash::<~str>() as map::<~str,~str>;`
`10`	`10`	`let y: map<uint,~str> = x;`
`11`	`11`	//~^ ERROR mismatched types: expected `@std::map::map<uint,~str>`
`12`	`12`	`}`