Imported Upstream version 1.9.0+dfsg1

[rustc.git] / src / test / compile-fail / issue-8640.rs

diff --git a/src/test/compile-fail/issue-8640.rs b/src/test/compile-fail/issue-8640.rs
index 5c1592e65473caa6fad5b4e5d5d6494c138b63ee..e469e05a2444a798c85c561a3dd86936a61843f8 100644 (file)
--- a/src/test/compile-fail/issue-8640.rs
+++ b/src/test/compile-fail/issue-8640.rs
@@ -12,8 +12,8 @@
 
 mod foo {
     use baz::bar;
-    //~^ ERROR import `bar` conflicts with existing submodule
     mod bar {}
+    //~^ ERROR a module named `bar` has already been imported
 }
 mod baz { pub mod bar {} }