---

tbelaire · tbelaire · commit 2699331893dc · 2015-04-27T00:45:51.000-04:00
yaml --- r: 206743 b: refs/heads/beta c: 372c69d h: refs/heads/master i: 206741: c754aa5 206739: 9968597 206735: e8f32f7 v: v3
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 5c05278fecf9b7d4ff64fe374fb5b4598908d064
+refs/heads/beta: 372c69d8d293985ad3bffbe5c5e527dc37e90169
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a
diff --git a/branches/beta/src/test/compile-fail/double-import.rs b/branches/beta/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() {}`