Also add logic to handle anon-const in unreachable_pub

rust-lang · Nov 2, 2024 · 435695a · 435695a
1 parent fca6a56
commit 435695a
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 11 deletions.
diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs
@@ -1336,7 +1336,30 @@ impl UnreachablePub {
                 }
             } else {
                 // current item can't be reach from crate, probably in an anon-const
-                "pub(crate)"
+                if let Some(direct_parent) = cx.tcx.opt_local_parent(def_id.into()) {
+                    if matches!(
+                        cx.tcx.def_kind(direct_parent),
+                        DefKind::AnonConst | DefKind::InlineConst
+                    ) {
+                        // current item at top level const-anon
+                        ""
+                    } else if let Some(direct_parent_parent) =
+                        cx.tcx.opt_local_parent(direct_parent)
+                        && matches!(
+                            cx.tcx.def_kind(direct_parent_parent),
+                            DefKind::AnonConst | DefKind::InlineConst
+                        )
+                    {
+                        // current item is restricted to the parent of it's parent (aka super)
+                        "pub(super)"
+                    } else {
+                        // current item is not restricted to the parent of it's parent
+                        "pub(crate)"
+                    }
+                } else {
+                    // current item has no parent, is that even possible?
+                    "pub(crate)"
+                }
             };
 
             if vis_span.from_expansion() {

diff --git a/tests/ui/lint/unreachable_pub.fixed b/tests/ui/lint/unreachable_pub.fixed
@@ -65,19 +65,24 @@ mod private_mod {
 
     fn foo() {
         const {
-            pub(crate) struct Foo; //~ WARNING unreachable_pub
+             struct Foo; //~ WARNING unreachable_pub
         };
     }
 
     enum Weird {
         Variant = {
-            pub(crate) struct Foo; //~ WARNING unreachable_pub
+             struct Foo; //~ WARNING unreachable_pub
 
             mod tmp {
-                pub(crate) struct Bar; //~ WARNING unreachable_pub
+                pub(super) struct Bar; //~ WARNING unreachable_pub
+
+                pub(super) mod inner { //~ WARNING unreachable_pub
+                    pub(crate) struct Inner; //~ WARNING unreachable_pub
+                }
             }
 
             let _ = tmp::Bar;
+            let _ = tmp::inner::Inner;
 
             0
         },

diff --git a/tests/ui/lint/unreachable_pub.rs b/tests/ui/lint/unreachable_pub.rs
@@ -75,9 +75,14 @@ mod private_mod {
 
             mod tmp {
                 pub struct Bar; //~ WARNING unreachable_pub
+
+                pub mod inner { //~ WARNING unreachable_pub
+                    pub struct Inner; //~ WARNING unreachable_pub
+                }
             }
 
             let _ = tmp::Bar;
+            let _ = tmp::inner::Inner;
 
             0
         },

diff --git a/tests/ui/lint/unreachable_pub.stderr b/tests/ui/lint/unreachable_pub.stderr
@@ -152,7 +152,7 @@ warning: unreachable `pub` item
 LL |             pub struct Foo;
    |             ---^^^^^^^^^^^
    |             |
-   |             help: consider restricting its visibility: `pub(crate)`
+   |             help: consider restricting its visibility
    |
    = help: or consider exporting it for use by other crates
 
@@ -162,12 +162,12 @@ warning: unreachable `pub` item
 LL |             pub struct Foo;
    |             ---^^^^^^^^^^^
    |             |
-   |             help: consider restricting its visibility: `pub(crate)`
+   |             help: consider restricting its visibility
    |
    = help: or consider exporting it for use by other crates
 
 warning: unreachable `pub` item
-  --> $DIR/unreachable_pub.rs:86:13
+  --> $DIR/unreachable_pub.rs:91:13
    |
 LL |     pub use fpu_precision::set_precision;
    |     ---     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -222,12 +222,32 @@ warning: unreachable `pub` item
 LL |                 pub struct Bar;
    |                 ---^^^^^^^^^^^
    |                 |
-   |                 help: consider restricting its visibility: `pub(crate)`
+   |                 help: consider restricting its visibility: `pub(super)`
    |
    = help: or consider exporting it for use by other crates
 
 warning: unreachable `pub` item
-  --> $DIR/unreachable_pub.rs:89:9
+  --> $DIR/unreachable_pub.rs:79:17
+   |
+LL |                 pub mod inner {
+   |                 ---^^^^^^^^^^
+   |                 |
+   |                 help: consider restricting its visibility: `pub(super)`
+   |
+   = help: or consider exporting it for use by other crates
+
+warning: unreachable `pub` item
+  --> $DIR/unreachable_pub.rs:80:21
+   |
+LL |                     pub struct Inner;
+   |                     ---^^^^^^^^^^^^^
+   |                     |
+   |                     help: consider restricting its visibility: `pub(crate)`
+   |
+   = help: or consider exporting it for use by other crates
+
+warning: unreachable `pub` item
+  --> $DIR/unreachable_pub.rs:94:9
    |
 LL |         pub fn set_precision<T>() {}
    |         ---^^^^^^^^^^^^^^^^^^^^^^
@@ -237,7 +257,7 @@ LL |         pub fn set_precision<T>() {}
    = help: or consider exporting it for use by other crates
 
 warning: unreachable `pub` item
-  --> $DIR/unreachable_pub.rs:90:9
+  --> $DIR/unreachable_pub.rs:95:9
    |
 LL |         pub fn set_micro_precision<T>() {}
    |         ---^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -246,5 +266,5 @@ LL |         pub fn set_micro_precision<T>() {}
    |
    = help: or consider exporting it for use by other crates
 
-warning: 24 warnings emitted
+warning: 26 warnings emitted