[WIP] Tweaks for crater

Author: petrochenkov

compiler/rustc_lint_defs/src/builtin.rs

@@ -4745,7 +4745,7 @@ declare_lint! {
     ///
     /// [future-incompatible]: ../index.md#future-incompatible-lints
     pub AMBIGUOUS_IMPORT_VISIBILITIES,
-    Warn,
+    Deny,
     "detects certain glob imports that require reporting an ambiguity error",
     @future_incompatible = FutureIncompatibleInfo {
         reason: fcw!(FutureReleaseError #149145),

compiler/rustc_resolve/src/ident.rs

@@ -925,16 +925,18 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                     None
                 };
 
-                self.ambiguity_errors.push(AmbiguityError {
-                    kind,
-                    ambig_vis,
-                    ident: ident.orig(orig_ident_span),
-                    b1: innermost_decl,
-                    b2: decl,
-                    scope1: innermost_scope,
-                    scope2: scope,
-                    warning,
-                });
+                if ambig_vis.is_none() {
+                    self.ambiguity_errors.push(AmbiguityError {
+                        kind,
+                        ambig_vis,
+                        ident: ident.orig(orig_ident_span),
+                        b1: innermost_decl,
+                        b2: decl,
+                        scope1: innermost_scope,
+                        scope2: scope,
+                        warning,
+                    });
+                }
                 return true;
             }
         }

tests/ui/imports/ambiguous-import-visibility-globglob.rs

@@ -1,5 +1,3 @@
-//@ check-pass
-
 mod m {
     pub struct S {}
 }
@@ -10,10 +8,10 @@ mod min_vis_first {
     pub use crate::m::*;
 
     pub use self::S as S1;
-    //~^ WARN ambiguous import visibility
+    //~^ ERROR ambiguous import visibility
     //~| WARN this was previously accepted
     pub(crate) use self::S as S2;
-    //~^ WARN ambiguous import visibility
+    //~^ ERROR ambiguous import visibility
     //~| WARN this was previously accepted
     use self::S as S3; // OK
 }
@@ -24,10 +22,10 @@ mod mid_vis_first {
     pub use crate::m::*;
 
     pub use self::S as S1;
-    //~^ WARN ambiguous import visibility
+    //~^ ERROR ambiguous import visibility
     //~| WARN this was previously accepted
     pub(crate) use self::S as S2;
-    //~^ WARN ambiguous import visibility
+    //~^ ERROR ambiguous import visibility
     //~| WARN this was previously accepted
     use self::S as S3; // OK
 }
@@ -38,10 +36,10 @@ mod max_vis_first {
     pub(crate) use crate::m::*;
 
     pub use self::S as S1;
-    //~^ WARN ambiguous import visibility
+    //~^ ERROR ambiguous import visibility
     //~| WARN this was previously accepted
     pub(crate) use self::S as S2;
-    //~^ WARN ambiguous import visibility
+    //~^ ERROR ambiguous import visibility
     //~| WARN this was previously accepted
     use self::S as S3; // OK
 }

tests/ui/imports/ambiguous-import-visibility-globglob.stderr

@@ -1,135 +1,135 @@
-warning: ambiguous import visibility: pub or pub(in crate::min_vis_first)
-  --> $DIR/ambiguous-import-visibility-globglob.rs:12:19
+error: ambiguous import visibility: pub or pub(in crate::min_vis_first)
+  --> $DIR/ambiguous-import-visibility-globglob.rs:10:19
    |
 LL |     pub use self::S as S1;
    |                   ^
    |
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `S` could refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:10:13
+  --> $DIR/ambiguous-import-visibility-globglob.rs:8:13
    |
 LL |     pub use crate::m::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
 note: `S` could also refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:8:9
+  --> $DIR/ambiguous-import-visibility-globglob.rs:6:9
    |
 LL |     use crate::m::*;
    |         ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #149145 <https://github.com/rust-lang/rust/issues/149145>
-   = note: `#[warn(ambiguous_import_visibilities)]` (part of `#[warn(future_incompatible)]`) on by default
+   = note: `#[deny(ambiguous_import_visibilities)]` (part of `#[deny(future_incompatible)]`) on by default
 
-warning: ambiguous import visibility: pub(crate) or pub(in crate::min_vis_first)
-  --> $DIR/ambiguous-import-visibility-globglob.rs:15:26
+error: ambiguous import visibility: pub(crate) or pub(in crate::min_vis_first)
+  --> $DIR/ambiguous-import-visibility-globglob.rs:13:26
    |
 LL |     pub(crate) use self::S as S2;
    |                          ^
    |
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `S` could refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:10:13
+  --> $DIR/ambiguous-import-visibility-globglob.rs:8:13
    |
 LL |     pub use crate::m::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
 note: `S` could also refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:8:9
+  --> $DIR/ambiguous-import-visibility-globglob.rs:6:9
    |
 LL |     use crate::m::*;
    |         ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #149145 <https://github.com/rust-lang/rust/issues/149145>
 
-warning: ambiguous import visibility: pub or pub(in crate::mid_vis_first)
-  --> $DIR/ambiguous-import-visibility-globglob.rs:26:19
+error: ambiguous import visibility: pub or pub(in crate::mid_vis_first)
+  --> $DIR/ambiguous-import-visibility-globglob.rs:24:19
    |
 LL |     pub use self::S as S1;
    |                   ^
    |
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `S` could refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:24:13
+  --> $DIR/ambiguous-import-visibility-globglob.rs:22:13
    |
 LL |     pub use crate::m::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
 note: `S` could also refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:23:9
+  --> $DIR/ambiguous-import-visibility-globglob.rs:21:9
    |
 LL |     use crate::m::*;
    |         ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #149145 <https://github.com/rust-lang/rust/issues/149145>
 
-warning: ambiguous import visibility: pub(crate) or pub(in crate::mid_vis_first)
-  --> $DIR/ambiguous-import-visibility-globglob.rs:29:26
+error: ambiguous import visibility: pub(crate) or pub(in crate::mid_vis_first)
+  --> $DIR/ambiguous-import-visibility-globglob.rs:27:26
    |
 LL |     pub(crate) use self::S as S2;
    |                          ^
    |
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `S` could refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:24:13
+  --> $DIR/ambiguous-import-visibility-globglob.rs:22:13
    |
 LL |     pub use crate::m::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
 note: `S` could also refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:23:9
+  --> $DIR/ambiguous-import-visibility-globglob.rs:21:9
    |
 LL |     use crate::m::*;
    |         ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #149145 <https://github.com/rust-lang/rust/issues/149145>
 
-warning: ambiguous import visibility: pub or pub(in crate::max_vis_first)
-  --> $DIR/ambiguous-import-visibility-globglob.rs:40:19
+error: ambiguous import visibility: pub or pub(in crate::max_vis_first)
+  --> $DIR/ambiguous-import-visibility-globglob.rs:38:19
    |
 LL |     pub use self::S as S1;
    |                   ^
    |
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `S` could refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:36:13
+  --> $DIR/ambiguous-import-visibility-globglob.rs:34:13
    |
 LL |     pub use crate::m::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
 note: `S` could also refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:37:9
+  --> $DIR/ambiguous-import-visibility-globglob.rs:35:9
    |
 LL |     use crate::m::*;
    |         ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #149145 <https://github.com/rust-lang/rust/issues/149145>
 
-warning: ambiguous import visibility: pub(crate) or pub(in crate::max_vis_first)
-  --> $DIR/ambiguous-import-visibility-globglob.rs:43:26
+error: ambiguous import visibility: pub(crate) or pub(in crate::max_vis_first)
+  --> $DIR/ambiguous-import-visibility-globglob.rs:41:26
    |
 LL |     pub(crate) use self::S as S2;
    |                          ^
    |
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `S` could refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:36:13
+  --> $DIR/ambiguous-import-visibility-globglob.rs:34:13
    |
 LL |     pub use crate::m::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
 note: `S` could also refer to the struct imported here
-  --> $DIR/ambiguous-import-visibility-globglob.rs:37:9
+  --> $DIR/ambiguous-import-visibility-globglob.rs:35:9
    |
 LL |     use crate::m::*;
    |         ^^^^^^^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #149145 <https://github.com/rust-lang/rust/issues/149145>
 
-warning: 6 warnings emitted
+error: aborting due to 6 previous errors
 

tests/ui/imports/ambiguous-import-visibility-macro.rs

@@ -14,6 +14,6 @@ globbing! {} // this imports the same `RustEmbed` macro with `pub` visibility
 
 pub trait RustEmbed {}
 
-pub use RustEmbed as Embed; //~ WARN ambiguous import visibility
-                            //~| WARN this was previously accepted
+pub use RustEmbed as Embed;
+
 fn main() {}

tests/ui/imports/ambiguous-import-visibility-macro.stderr

@@ -15,8 +15,7 @@ mod reexport {
     pub use m::*;
     mac!();
 
-    pub use S as Z; //~ WARN ambiguous import visibility
-                    //~| WARN this was previously accepted
+    pub use S as Z;
 }
 
 fn main() {

tests/ui/imports/ambiguous-import-visibility-module.rs

@@ -9,6 +9,6 @@ pub use same_res_ambigious_extern_macro::*;
 
 pub trait RustEmbed {}
 
-pub use RustEmbed as Embed; //~ WARN ambiguous import visibility
-                            //~| WARN this was previously accepted
+pub use RustEmbed as Embed;
+
 fn main() {}