New upstream version 1.20.0+dfsg1

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

diff --git a/src/test/compile-fail/resolve-conflict-import-vs-extern-crate.rs b/src/test/compile-fail/resolve-conflict-import-vs-extern-crate.rs
index 6cbc728c03edcad6edbc800d26a91881eba3eff5..91cf1d359542c9acf6cd047c379f2499fb7c32bd 100644 (file)
--- a/src/test/compile-fail/resolve-conflict-import-vs-extern-crate.rs
+++ b/src/test/compile-fail/resolve-conflict-import-vs-extern-crate.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::slice as std; //~ ERROR an extern crate named `std` has already been imported
+use std::slice as std; //~ ERROR the name `std` is defined multiple times
 
 fn main() {
 }