Imported Upstream version 1.9.0+dfsg1

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

diff --git a/src/test/compile-fail/resolve-conflict-item-vs-import.rs b/src/test/compile-fail/resolve-conflict-item-vs-import.rs
index 1edf815ecaeca402f5b6be30fef47213f07d8dec..dbd1ecf44fd7312d7a776e2a0ba39e1cd5513bd5 100644 (file)
--- a/src/test/compile-fail/resolve-conflict-item-vs-import.rs
+++ b/src/test/compile-fail/resolve-conflict-item-vs-import.rs
@@ -9,9 +9,10 @@
 // except according to those terms.
 
 use std::mem::transmute;
-//~^ ERROR import `transmute` conflicts with value in this module
+//~^ NOTE previous import of `transmute` here
 
 fn transmute() {}
+//~^ ERROR a value named `transmute` has already been imported in this module
 
 fn main() {
 }