Fix fallout in tests.

Author: jseyfried

src/test/auxiliary/issue_12612_1.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 pub mod bar {
-    pub fn foo() {}
+    fn foo() {}
 }

src/test/compile-fail/glob-cycles.rs

@@ -13,7 +13,7 @@
 #![no_implicit_prelude]
 
 use foo::*;
-use bar::*; //~ERROR a type named `Baz` has already been imported in this module
+use bar::*;
 
 mod foo {
     pub type Baz = isize;
@@ -23,8 +23,6 @@ mod bar {
     pub type Baz = isize;
 }
 
-mod qux {
-    pub use bar::Baz;
+fn main() {
+    Baz; //~ ERROR
 }
-
-fn main() {}

src/test/compile-fail/import-shadow-1.rs

@@ -15,8 +15,7 @@ extern crate issue_12612_1 as foo;
 use foo::bar;
 
 mod test {
-    use bar::foo;
-    //~^ ERROR unresolved import `bar::foo`. Maybe a missing `extern crate bar`?
+    use bar::foo; //~ ERROR `foo` is private
 }
 
 fn main() {}

src/test/compile-fail/import-shadow-2.rs

@@ -10,6 +10,6 @@
 
 // Testing that we don't fail abnormally after hitting the errors
 
-use unresolved::*; //~ ERROR unresolved import `unresolved::*`. Maybe a missing `extern crate unres
+use unresolved::*; //~ ERROR unresolved import
 
 fn main() {}

src/test/compile-fail/import-shadow-3.rs

@@ -31,14 +31,14 @@ const XTuple: u8 = 0;
 const XUnit: u8 = 0;
 
 extern crate variant_namespacing;
-pub use variant_namespacing::XE::*;
+pub use variant_namespacing::XE::{XStruct, XTuple, XUnit};
 //~^ ERROR `XStruct` has already been defined
 //~| ERROR `XStruct` has already been defined
 //~| ERROR `XTuple` has already been defined
 //~| ERROR `XTuple` has already been defined
 //~| ERROR `XUnit` has already been defined
 //~| ERROR `XUnit` has already been defined
-pub use E::*;
+pub use E::{Struct, Tuple, Unit};
 //~^ ERROR `Struct` has already been defined
 //~| ERROR `Struct` has already been defined
 //~| ERROR `Tuple` has already been defined