---

tbelaire · tbelaire · commit 52b3d10bc2fe · 2015-04-27T00:45:51.000-04:00
yaml --- r: 210631 b: refs/heads/try c: 372c69d h: refs/heads/master i: 210629: 3f6aee2 210627: b5a2992 210623: e2c663d v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 5c05278fecf9b7d4ff64fe374fb5b4598908d064
+refs/heads/try: 372c69d8d293985ad3bffbe5c5e527dc37e90169
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try/src/test/compile-fail/double-import.rs b/branches/try/src/test/compile-fail/double-import.rs
@@ -19,7 +19,7 @@ mod sub2 {
     fn foo() {} // implementation 2
 }
 
-use sub1::foo; //~ note previous import of `foo` here
-use sub2::foo; //~ error a value named `foo` has already been imported in this module [e0252]
+use sub1::foo; //~ NOTE previous import of `foo` here
+use sub2::foo; //~ ERROR a value named `foo` has already been imported in this module [E0252]
 
 fn main() {}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ mod sub2 {`
`19`	`19`	`fn foo() {} // implementation 2`
`20`	`20`	`}`
`21`	`21`
`22`		-use sub1::foo; //~ note previous import of `foo` here
`23`		-use sub2::foo; //~ error a value named `foo` has already been imported in this module [e0252]
	`22`	+use sub1::foo; //~ NOTE previous import of `foo` here
	`23`	+use sub2::foo; //~ ERROR a value named `foo` has already been imported in this module [E0252]
`24`	`24`
`25`	`25`	`fn main() {}`