---

tbelaire · tbelaire · commit 9dc5995f9e0e · 2015-04-27T00:45:51.000-04:00
yaml --- r: 216934 b: refs/heads/stable c: 372c69d h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -29,5 +29,5 @@ refs/heads/tmp: 378a370ff2057afeb1eae86eb6e78c476866a4a6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 5c05278fecf9b7d4ff64fe374fb5b4598908d064
+refs/heads/stable: 372c69d8d293985ad3bffbe5c5e527dc37e90169
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
diff --git a/branches/stable/src/test/compile-fail/double-import.rs b/branches/stable/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() {}`