Imported Upstream version 1.9.0+dfsg1

[rustc.git] / src / test / compile-fail / resolve-conflict-type-vs-import.rs

diff --git a/src/test/compile-fail/resolve-conflict-type-vs-import.rs b/src/test/compile-fail/resolve-conflict-type-vs-import.rs
index 45b0314d2c01da88190a844571b87fecb337bb44..aa7e47e223ff5a9ec04b268114a36f74bfcdf7af 100644 (file)
--- a/src/test/compile-fail/resolve-conflict-type-vs-import.rs
+++ b/src/test/compile-fail/resolve-conflict-type-vs-import.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 use std::slice::Iter;
-//~^ ERROR import `Iter` conflicts with type in this module
 
 struct Iter;
+//~^ ERROR a type named `Iter` has already been imported in this module
 
 fn main() {
 }