New upstream version 1.20.0+dfsg1

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

diff --git a/src/test/compile-fail/issue-26886.rs b/src/test/compile-fail/issue-26886.rs
index 46e82363c8bd832597d76b525427754b9c0a0a51..9b1950601961f9a0df23a83c4b4f6f25602d10ce 100644 (file)
--- a/src/test/compile-fail/issue-26886.rs
+++ b/src/test/compile-fail/issue-26886.rs
@@ -8,12 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::sync::{self, Arc}; //~ NOTE previous import
-                            //~^ NOTE previous import
-use std::sync::Arc; //~ ERROR a type named
-                    //~| NOTE already imported
-use std::sync; //~ ERROR a module named
-               //~| NOTE already imported
+use std::sync::{self, Arc}; //~ NOTE previous import of the type `Arc` here
+                            //~^ NOTE previous import of the module `sync` here
+use std::sync::Arc; //~ ERROR the name `Arc` is defined multiple times
+                    //~| NOTE `Arc` reimported here
+                    //~| `Arc` must be defined only once in the type namespace of this module
+use std::sync; //~ ERROR the name `sync` is defined multiple times
+               //~| NOTE `sync` reimported here
+               //~| `sync` must be defined only once in the type namespace of this module
 
 fn main() {
 }