Skip to content

Commit 64d7e0d

Browse files
borsbors
committed
Auto merge of rust-lang#115993 - bvanjoi:fix-115966, r=petrochenkov
vis note for no pub reexports glob import Fixes rust-lang#115966 Only trigger the `unused_import` lint when it's not being used. r? `@petrochenkov`
2 parents 63d16b5 + d0941f9 commit 64d7e0d

File tree

12 files changed

+118
-32
lines changed

12 files changed

+118
-32
lines changed

‎compiler/rustc_lint/src/context.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -926,6 +926,10 @@ pub trait LintContext {
926926
if elided { "'static " } else { "'static" },
927927
Applicability::MachineApplicable
928928
);
929+
},
930+
BuiltinLintDiagnostics::RedundantImportVisibility { max_vis, span } => {
931+
db.span_note(span, format!("the most public imported item is `{max_vis}`"));
932+
db.help("reduce the glob import's visibility or increase visibility of imported items");
929933
}
930934
}
931935
// Rewrap `db`, and pass control to the user.

‎compiler/rustc_lint_defs/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,10 @@ pub enum BuiltinLintDiagnostics {
583583
elided: bool,
584584
span: Span,
585585
},
586+
RedundantImportVisibility {
587+
span: Span,
588+
max_vis: String,
589+
},
586590
}
587591

588592
/// Lints that are buffered up early on in the `Session` before the

‎compiler/rustc_middle/src/ty/mod.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,23 @@ pub enum Visibility<Id = LocalDefId> {
296296
Restricted(Id),
297297
}
298298

299+
impl Visibility {
300+
pub fn to_string(self, def_id: LocalDefId, tcx: TyCtxt<'_>) -> String {
301+
match self {
302+
ty::Visibility::Restricted(restricted_id) => {
303+
if restricted_id.is_top_level_module() {
304+
"pub(crate)".to_string()
305+
} else if restricted_id == tcx.parent_module_from_def_id(def_id).to_local_def_id() {
306+
"pub(self)".to_string()
307+
} else {
308+
format!("pub({})", tcx.item_name(restricted_id.to_def_id()))
309+
}
310+
}
311+
ty::Visibility::Public => "pub".to_string(),
312+
}
313+
}
314+
}
315+
299316
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, HashStable, TyEncodable, TyDecodable)]
300317
pub enum BoundConstness {
301318
/// `T: Trait`

‎compiler/rustc_privacy/src/lib.rs

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -888,29 +888,14 @@ pub struct TestReachabilityVisitor<'tcx, 'a> {
888888
effective_visibilities: &'a EffectiveVisibilities,
889889
}
890890

891-
fn vis_to_string<'tcx>(def_id: LocalDefId, vis: ty::Visibility, tcx: TyCtxt<'tcx>) -> String {
892-
match vis {
893-
ty::Visibility::Restricted(restricted_id) => {
894-
if restricted_id.is_top_level_module() {
895-
"pub(crate)".to_string()
896-
} else if restricted_id == tcx.parent_module_from_def_id(def_id).to_local_def_id() {
897-
"pub(self)".to_string()
898-
} else {
899-
format!("pub({})", tcx.item_name(restricted_id.to_def_id()))
900-
}
901-
}
902-
ty::Visibility::Public => "pub".to_string(),
903-
}
904-
}
905-
906891
impl<'tcx, 'a> TestReachabilityVisitor<'tcx, 'a> {
907892
fn effective_visibility_diagnostic(&mut self, def_id: LocalDefId) {
908893
if self.tcx.has_attr(def_id, sym::rustc_effective_visibility) {
909894
let mut error_msg = String::new();
910895
let span = self.tcx.def_span(def_id.to_def_id());
911896
if let Some(effective_vis) = self.effective_visibilities.effective_vis(def_id) {
912897
for level in Level::all_levels() {
913-
let vis_str = vis_to_string(def_id, *effective_vis.at_level(level), self.tcx);
898+
let vis_str = effective_vis.at_level(level).to_string(def_id, self.tcx);
914899
if level != Level::Direct {
915900
error_msg.push_str(", ");
916901
}
@@ -1506,11 +1491,11 @@ impl SearchInterfaceForPrivateItemsVisitor<'_> {
15061491
tcx: self.tcx,
15071492
})
15081493
.into(),
1509-
item_vis_descr: &vis_to_string(self.item_def_id, reachable_at_vis, self.tcx),
1494+
item_vis_descr: &reachable_at_vis.to_string(self.item_def_id, self.tcx),
15101495
ty_span: vis_span,
15111496
ty_kind: kind,
15121497
ty_descr: descr.into(),
1513-
ty_vis_descr: &vis_to_string(local_def_id, vis, self.tcx),
1498+
ty_vis_descr: &vis.to_string(local_def_id, self.tcx),
15141499
},
15151500
);
15161501
}
@@ -1589,8 +1574,8 @@ impl<'tcx> PrivateItemsInPublicInterfacesChecker<'tcx, '_> {
15891574
span,
15901575
kind: self.tcx.def_descr(def_id.to_def_id()),
15911576
descr: (&LazyDefPathStr { def_id: def_id.to_def_id(), tcx: self.tcx }).into(),
1592-
reachable_vis: &vis_to_string(def_id, *reachable_at_vis, self.tcx),
1593-
reexported_vis: &vis_to_string(def_id, *reexported_at_vis, self.tcx),
1577+
reachable_vis: &reachable_at_vis.to_string(def_id, self.tcx),
1578+
reexported_vis: &reexported_at_vis.to_string(def_id, self.tcx),
15941579
},
15951580
);
15961581
}

‎compiler/rustc_resolve/messages.ftl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ resolve_generic_params_from_outer_item_self_ty_param = can't use `Self` here
127127
128128
resolve_generic_params_from_outer_item_ty_param = type parameter from outer item
129129
130-
resolve_glob_import_doesnt_reexport =
131-
glob import doesn't reexport anything because no candidate is public enough
132130
133131
resolve_ident_bound_more_than_once_in_parameter_list =
134132
identifier `{$identifier}` is bound more than once in this parameter list

‎compiler/rustc_resolve/src/imports.rs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::errors::{
88
ItemsInTraitsAreNotImportable,
99
};
1010
use crate::Determinacy::{self, *};
11-
use crate::{fluent_generated as fluent, Namespace::*};
11+
use crate::Namespace::*;
1212
use crate::{module_to_string, names_to_string, ImportSuggestion};
1313
use crate::{AmbiguityKind, BindingKey, ModuleKind, ResolutionError, Resolver, Segment};
1414
use crate::{Finalize, Module, ModuleOrUniformRoot, ParentScope, PerNS, ScopeSet};
@@ -987,13 +987,23 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
987987
}
988988
if !is_prelude
989989
&& let Some(max_vis) = max_vis.get()
990-
&& !max_vis.is_at_least(import.expect_vis(), self.tcx)
990+
&& let import_vis = import.expect_vis()
991+
&& !max_vis.is_at_least(import_vis, self.tcx)
991992
{
992-
self.lint_buffer.buffer_lint(
993+
let def_id = self.local_def_id(id);
994+
let msg = format!(
995+
"glob import doesn't reexport anything with visibility `{}` because no imported item is public enough",
996+
import_vis.to_string(def_id, self.tcx)
997+
);
998+
self.lint_buffer.buffer_lint_with_diagnostic(
993999
UNUSED_IMPORTS,
9941000
id,
9951001
import.span,
996-
fluent::resolve_glob_import_doesnt_reexport,
1002+
msg.to_string(),
1003+
BuiltinLintDiagnostics::RedundantImportVisibility {
1004+
max_vis: max_vis.to_string(def_id, self.tcx),
1005+
span: import.span,
1006+
},
9971007
);
9981008
}
9991009
return None;

‎tests/ui/imports/no-pub-reexports-but-used.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// check-pass
2+
// https://github.com/rust-lang/rust/issues/115966
3+
4+
mod m {
5+
pub(crate) type A = u8;
6+
}
7+
8+
#[warn(unused_imports)] //~ NOTE: the lint level is defined here
9+
pub use m::*;
10+
//~^ WARNING: glob import doesn't reexport anything with visibility `pub` because no imported item is public enough
11+
//~| NOTE: the most public imported item is `pub(crate)`
12+
13+
fn main() {
14+
let _: A;
15+
}

‎tests/ui/imports/no-pub-reexports-but-used.stderr

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
warning: glob import doesn't reexport anything with visibility `pub` because no imported item is public enough
2+
--> $DIR/no-pub-reexports-but-used.rs:9:9
3+
|
4+
LL | pub use m::*;
5+
| ^^^^
6+
|
7+
note: the most public imported item is `pub(crate)`
8+
--> $DIR/no-pub-reexports-but-used.rs:9:9
9+
|
10+
LL | pub use m::*;
11+
| ^^^^
12+
= help: reduce the glob import's visibility or increase visibility of imported items
13+
note: the lint level is defined here
14+
--> $DIR/no-pub-reexports-but-used.rs:8:8
15+
|
16+
LL | #[warn(unused_imports)]
17+
| ^^^^^^^^^^^^^^
18+
19+
warning: 1 warning emitted
20+

‎tests/ui/imports/reexports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mod a {
99
//~^ ERROR cannot be re-exported
1010
//~| WARNING unused import: `super::foo`
1111
pub use super::*;
12-
//~^ WARNING glob import doesn't reexport anything because no candidate is public enough
12+
//~^ WARNING glob import doesn't reexport anything with visibility `pub` because no imported item is public enough
1313
//~| WARNING unused import: `super::*`
1414
}
1515
}

‎tests/ui/imports/reexports.stderr

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,18 @@ note: the lint level is defined here
5656
LL | #![warn(unused_imports)]
5757
| ^^^^^^^^^^^^^^
5858

59-
warning: glob import doesn't reexport anything because no candidate is public enough
59+
warning: glob import doesn't reexport anything with visibility `pub` because no imported item is public enough
6060
--> $DIR/reexports.rs:11:17
6161
|
6262
LL | pub use super::*;
6363
| ^^^^^^^^
64+
|
65+
note: the most public imported item is `pub(a)`
66+
--> $DIR/reexports.rs:11:17
67+
|
68+
LL | pub use super::*;
69+
| ^^^^^^^^
70+
= help: reduce the glob import's visibility or increase visibility of imported items
6471

6572
warning: unused import: `super::*`
6673
--> $DIR/reexports.rs:11:17

0 commit comments

Comments
 (0)