---

pcwalton · pcwalton · commit 1ce073cf0be7 · 2012-08-15T16:51:51.000-07:00
yaml --- r: 29861 b: refs/heads/incoming c: e1b11aa h: refs/heads/master i: 29859: ab5e90e v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 6319c8fbc4840e02ee325c6c10bd487ef06518fb
+refs/heads/incoming: e1b11aaf4b44152317e1607a959100c12bf24c54
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/test/compile-fail/map-types.rs b/branches/incoming/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`	`}`