forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#109704 - petrochenkov:effvisclean, r=jackh726
resolve: Minor improvements to effective visibilities See individual commits.
- Loading branch information
Showing
5 changed files
with
72 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,140 +1,152 @@ | ||
error: Direct: pub, Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:1:1 | ||
| | ||
LL | / #![rustc_effective_visibility] | ||
LL | | #![feature(rustc_attrs)] | ||
LL | | | ||
LL | | #[rustc_effective_visibility] | ||
... | | ||
LL | | | ||
LL | | fn main() {} | ||
| |____________^ | ||
|
||
error: Direct: pub(crate), Reexported: pub(crate), Reachable: pub(crate), ReachableThroughImplTrait: pub(crate) | ||
--> $DIR/effective_visibilities.rs:4:1 | ||
--> $DIR/effective_visibilities.rs:5:1 | ||
| | ||
LL | mod outer { | ||
| ^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:6:5 | ||
--> $DIR/effective_visibilities.rs:7:5 | ||
| | ||
LL | pub mod inner1 { | ||
| ^^^^^^^^^^^^^^ | ||
|
||
error: not in the table | ||
--> $DIR/effective_visibilities.rs:9:9 | ||
--> $DIR/effective_visibilities.rs:10:9 | ||
| | ||
LL | extern "C" {} | ||
| ^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:12:9 | ||
--> $DIR/effective_visibilities.rs:13:9 | ||
| | ||
LL | pub trait PubTrait { | ||
| ^^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(self), Reexported: pub(self), Reachable: pub(self), ReachableThroughImplTrait: pub(self) | ||
--> $DIR/effective_visibilities.rs:20:9 | ||
--> $DIR/effective_visibilities.rs:21:9 | ||
| | ||
LL | struct PrivStruct; | ||
| ^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(self), Reexported: pub(self), Reachable: pub(self), ReachableThroughImplTrait: pub(self) | ||
--> $DIR/effective_visibilities.rs:20:9 | ||
--> $DIR/effective_visibilities.rs:21:9 | ||
| | ||
LL | struct PrivStruct; | ||
| ^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:24:9 | ||
--> $DIR/effective_visibilities.rs:25:9 | ||
| | ||
LL | pub union PubUnion { | ||
| ^^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(self), Reexported: pub(self), Reachable: pub(self), ReachableThroughImplTrait: pub(self) | ||
--> $DIR/effective_visibilities.rs:26:13 | ||
--> $DIR/effective_visibilities.rs:27:13 | ||
| | ||
LL | a: u8, | ||
| ^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:28:13 | ||
--> $DIR/effective_visibilities.rs:29:13 | ||
| | ||
LL | pub b: u8, | ||
| ^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:32:9 | ||
--> $DIR/effective_visibilities.rs:33:9 | ||
| | ||
LL | pub enum Enum { | ||
| ^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:34:13 | ||
--> $DIR/effective_visibilities.rs:35:13 | ||
| | ||
LL | A( | ||
| ^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:34:13 | ||
--> $DIR/effective_visibilities.rs:35:13 | ||
| | ||
LL | A( | ||
| ^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:37:17 | ||
--> $DIR/effective_visibilities.rs:38:17 | ||
| | ||
LL | PubUnion, | ||
| ^^^^^^^^ | ||
|
||
error: not in the table | ||
--> $DIR/effective_visibilities.rs:43:5 | ||
--> $DIR/effective_visibilities.rs:44:5 | ||
| | ||
LL | macro_rules! none_macro { | ||
| ^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(self), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:49:5 | ||
--> $DIR/effective_visibilities.rs:50:5 | ||
| | ||
LL | macro_rules! public_macro { | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub(crate), Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:54:5 | ||
--> $DIR/effective_visibilities.rs:55:5 | ||
| | ||
LL | pub struct ReachableStruct { | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub(crate), Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:56:9 | ||
--> $DIR/effective_visibilities.rs:57:9 | ||
| | ||
LL | pub a: u8, | ||
| ^^^^^^^^^ | ||
|
||
error: Direct: pub, Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:61:9 | ||
--> $DIR/effective_visibilities.rs:62:9 | ||
| | ||
LL | pub use outer::inner1; | ||
| ^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:67:5 | ||
--> $DIR/effective_visibilities.rs:68:5 | ||
| | ||
LL | pub type HalfPublicImport = u8; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub(crate), Reachable: pub(crate), ReachableThroughImplTrait: pub(crate) | ||
--> $DIR/effective_visibilities.rs:70:5 | ||
--> $DIR/effective_visibilities.rs:71:5 | ||
| | ||
LL | pub(crate) const HalfPublicImport: u8 = 0; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub, Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:74:9 | ||
--> $DIR/effective_visibilities.rs:75:9 | ||
| | ||
LL | pub use half_public_import::HalfPublicImport; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:14:13 | ||
--> $DIR/effective_visibilities.rs:15:13 | ||
| | ||
LL | const A: i32; | ||
| ^^^^^^^^^^^^ | ||
|
||
error: Direct: pub(crate), Reexported: pub, Reachable: pub, ReachableThroughImplTrait: pub | ||
--> $DIR/effective_visibilities.rs:16:13 | ||
--> $DIR/effective_visibilities.rs:17:13 | ||
| | ||
LL | type B; | ||
| ^^^^^^ | ||
|
||
error: aborting due to 23 previous errors | ||
error: aborting due to 24 previous errors | ||
|