bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Adjust span labels for HIDDEN_GLOB_REEXPORTS

Browse source
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2023-06-08 15:03:21 +08:00
parent 43062c43d2
commit 80176a120e
No known key found for this signature in database
GPG key ID: C5FD5D32014FDB47
3 changed files with 40 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_lint/src/context.rs
View file

@ -953,8 +953,8 @@ pub trait LintContext: Sized {
db.span_label(duplicate_reexport_span, format!("but the name `{}` in the {} namespace is also re-exported here", name, namespace)); db.span_label(duplicate_reexport_span, format!("but the name `{}` in the {} namespace is also re-exported here", name, namespace));
} }
BuiltinLintDiagnostics::HiddenGlobReexports { name, namespace, glob_reexport_span, private_item_span } => { BuiltinLintDiagnostics::HiddenGlobReexports { name, namespace, glob_reexport_span, private_item_span } => {
db.span_label(glob_reexport_span, format!("the name `{}` in the {} namespace is supposed to be publicly re-exported here", name, namespace)); db.span_note(glob_reexport_span, format!("the name `{}` in the {} namespace is supposed to be publicly re-exported here", name, namespace));
db.span_label(private_item_span, "but the private item here shadows it"); db.span_note(private_item_span, "but the private item here shadows it".to_owned());
} }
} }
// Rewrap `db`, and pass control to the user. // Rewrap `db`, and pass control to the user.

4
tests/ui/resolve/hidden_glob_reexports.rs
View file

@ -6,10 +6,10 @@ pub mod upstream_a {
pub struct Bar {} pub struct Bar {}
} }
pub use self::inner::*;
struct Foo; struct Foo;
//~^ WARN private item shadows public glob re-export //~^ WARN private item shadows public glob re-export
pub use self::inner::*;
} }
pub mod upstream_b { pub mod upstream_b {

49
tests/ui/resolve/hidden_glob_reexports.stderr
View file

@ -1,31 +1,54 @@
warning: private item shadows public glob re-export warning: private item shadows public glob re-export
--> $DIR/hidden_glob_reexports.rs:11:5 --> $DIR/hidden_glob_reexports.rs:9:5
|
LL | struct Foo;
| ^^^^^^^^^^^
|
note: the name `Foo` in the type namespace is supposed to be publicly re-exported here
--> $DIR/hidden_glob_reexports.rs:12:13
| |
LL | pub use self::inner::*; LL | pub use self::inner::*;
| -------------- the name `Foo` in the type namespace is supposed to be publicly re-exported here | ^^^^^^^^^^^^^^
LL | note: but the private item here shadows it
LL | struct Foo; --> $DIR/hidden_glob_reexports.rs:9:5
| ^^^^^^^^^^^ but the private item here shadows it
| |
LL | struct Foo;
| ^^^^^^^^^^^
= note: `#[warn(hidden_glob_reexports)]` on by default = note: `#[warn(hidden_glob_reexports)]` on by default
warning: private item shadows public glob re-export warning: private item shadows public glob re-export
--> $DIR/hidden_glob_reexports.rs:27:9 --> $DIR/hidden_glob_reexports.rs:27:9
| |
LL | pub use self::inner::*;
| -------------- the name `Foo` in the type namespace is supposed to be publicly re-exported here
LL |
LL | use self::other::Foo; LL | use self::other::Foo;
| ^^^^^^^^^^^^^^^^ but the private item here shadows it | ^^^^^^^^^^^^^^^^
|
note: the name `Foo` in the type namespace is supposed to be publicly re-exported here
--> $DIR/hidden_glob_reexports.rs:25:13
|
LL | pub use self::inner::*;
| ^^^^^^^^^^^^^^
note: but the private item here shadows it
--> $DIR/hidden_glob_reexports.rs:27:9
|
LL | use self::other::Foo;
| ^^^^^^^^^^^^^^^^
warning: private item shadows public glob re-export warning: private item shadows public glob re-export
--> $DIR/hidden_glob_reexports.rs:40:9 --> $DIR/hidden_glob_reexports.rs:40:9
| |
LL | pub use self::no_def_id::*;
| ------------------ the name `u8` in the type namespace is supposed to be publicly re-exported here
LL |
LL | use std::primitive::u8; LL | use std::primitive::u8;
| ^^^^^^^^^^^^^^^^^^ but the private item here shadows it | ^^^^^^^^^^^^^^^^^^
|
note: the name `u8` in the type namespace is supposed to be publicly re-exported here
--> $DIR/hidden_glob_reexports.rs:38:13
|
LL | pub use self::no_def_id::*;
| ^^^^^^^^^^^^^^^^^^
note: but the private item here shadows it
--> $DIR/hidden_glob_reexports.rs:40:9
|
LL | use std::primitive::u8;
| ^^^^^^^^^^^^^^^^^^
warning: 3 warnings emitted warning: 3 warnings emitted