Auto merge of #101949 - matthiaskrgr:rollup-xu5cqnd, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #101093 (Initial version of 1.64 release notes) - #101713 (change AccessLevels representation) - #101821 (Bump Unicode to version 15.0.0, regenerate tables) - #101826 (Enforce "joined()" and "joined_with_noop()" test) - #101835 (Allow using vendoring when running bootstrap from outside the source root) - #101942 (Revert "Copy stage0 binaries into stage0-sysroot") - #101943 (rustdoc: remove unused CSS `.non-exhaustive { margin-bottom }`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
bors
commit
5253b0a0a1
22 changed files with 600 additions and 376 deletions
|
|
@ -67,9 +67,7 @@ async fn joined() {
|
|||
let c = Big::new();
|
||||
|
||||
fut().await;
|
||||
noop();
|
||||
joiner = Joiner { a: Some(a), b: Some(b), c: Some(c) };
|
||||
noop();
|
||||
}
|
||||
|
||||
async fn joined_with_noop() {
|
||||
|
|
@ -97,7 +95,7 @@ async fn join_retval() -> Joiner {
|
|||
fn main() {
|
||||
assert_eq!(2, std::mem::size_of_val(&single()));
|
||||
assert_eq!(3, std::mem::size_of_val(&single_with_noop()));
|
||||
assert_eq!(3078, std::mem::size_of_val(&joined()));
|
||||
assert_eq!(3074, std::mem::size_of_val(&joined()));
|
||||
assert_eq!(3078, std::mem::size_of_val(&joined_with_noop()));
|
||||
assert_eq!(3074, std::mem::size_of_val(&join_retval()));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,49 +1,62 @@
|
|||
#![feature(rustc_attrs)]
|
||||
|
||||
#[rustc_access_level] mod outer { //~ ERROR None
|
||||
#[rustc_access_level] pub mod inner { //~ ERROR Some(Exported)
|
||||
#[rustc_access_level]
|
||||
extern "C" { //~ ERROR Some(Exported)
|
||||
#[rustc_access_level] static a: u8; //~ ERROR None
|
||||
#[rustc_access_level] pub fn b(); //~ ERROR Some(Exported)
|
||||
}
|
||||
#[rustc_access_level]
|
||||
pub trait Trait { //~ ERROR Some(Exported)
|
||||
#[rustc_access_level] const A: i32; //~ ERROR Some(Exported)
|
||||
#[rustc_access_level] type B; //~ ERROR Some(Exported)
|
||||
#[rustc_effective_visibility]
|
||||
mod outer { //~ ERROR Public: pub(self), Exported: pub(self), Reachable: pub(self), ReachableFromImplTrait: pub(self)
|
||||
#[rustc_effective_visibility]
|
||||
pub mod inner1 { //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
|
||||
#[rustc_effective_visibility]
|
||||
extern "C" {} //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
|
||||
#[rustc_effective_visibility]
|
||||
pub trait PubTrait { //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
#[rustc_effective_visibility]
|
||||
const A: i32; //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
#[rustc_effective_visibility]
|
||||
type B; //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
}
|
||||
|
||||
#[rustc_access_level]
|
||||
pub struct Struct { //~ ERROR Some(Exported)
|
||||
#[rustc_access_level] a: u8, //~ ERROR None
|
||||
#[rustc_access_level] pub b: u8, //~ ERROR Some(Exported)
|
||||
#[rustc_effective_visibility]
|
||||
struct PrivStruct; //~ ERROR Public: pub(self), Exported: pub(self), Reachable: pub(self), ReachableFromImplTrait: pub(self)
|
||||
|
||||
#[rustc_effective_visibility]
|
||||
pub union PubUnion { //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
#[rustc_effective_visibility]
|
||||
a: u8, //~ ERROR Public: pub(self), Exported: pub(self), Reachable: pub(self), ReachableFromImplTrait: pub(self)
|
||||
#[rustc_effective_visibility]
|
||||
pub b: u8, //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
}
|
||||
|
||||
#[rustc_access_level]
|
||||
pub union Union { //~ ERROR Some(Exported)
|
||||
#[rustc_access_level] a: u8, //~ ERROR None
|
||||
#[rustc_access_level] pub b: u8, //~ ERROR Some(Exported)
|
||||
}
|
||||
|
||||
#[rustc_access_level]
|
||||
pub enum Enum { //~ ERROR Some(Exported)
|
||||
#[rustc_access_level] A( //~ ERROR Some(Exported)
|
||||
#[rustc_access_level] Struct, //~ ERROR Some(Exported)
|
||||
#[rustc_access_level] Union, //~ ERROR Some(Exported)
|
||||
#[rustc_effective_visibility]
|
||||
pub enum Enum { //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
#[rustc_effective_visibility]
|
||||
A( //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
#[rustc_effective_visibility]
|
||||
PubUnion, //~ ERROR Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
#[rustc_access_level] macro_rules! none_macro { //~ ERROR None
|
||||
#[rustc_effective_visibility]
|
||||
macro_rules! none_macro { //~ Public: pub(self), Exported: pub(self), Reachable: pub(self), ReachableFromImplTrait: pub(self)
|
||||
() => {};
|
||||
}
|
||||
|
||||
#[macro_export]
|
||||
#[rustc_access_level] macro_rules! public_macro { //~ ERROR Some(Public)
|
||||
#[rustc_effective_visibility]
|
||||
macro_rules! public_macro { //~ Public: pub, Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
() => {};
|
||||
}
|
||||
|
||||
#[rustc_effective_visibility]
|
||||
pub struct ReachableStruct { //~ ERROR Public: pub(self), Exported: pub(self), Reachable: pub, ReachableFromImplTrait: pub
|
||||
#[rustc_effective_visibility]
|
||||
pub a: u8, //~ ERROR Public: pub(self), Exported: pub(self), Reachable: pub, ReachableFromImplTrait: pub
|
||||
}
|
||||
}
|
||||
|
||||
pub use outer::inner;
|
||||
pub use outer::inner1;
|
||||
|
||||
pub fn foo() -> outer::ReachableStruct { outer::ReachableStruct {a: 0} }
|
||||
|
||||
fn main() {}
|
||||
|
|
|
|||
|
|
@ -1,125 +1,104 @@
|
|||
error: None
|
||||
--> $DIR/access_levels.rs:3:23
|
||||
error: Public: pub(self), Exported: pub(self), Reachable: pub(self), ReachableFromImplTrait: pub(self)
|
||||
--> $DIR/access_levels.rs:4:1
|
||||
|
|
||||
LL | #[rustc_access_level] mod outer {
|
||||
| ^^^^^^^^^
|
||||
LL | mod outer {
|
||||
| ^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:4:27
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:6:5
|
||||
|
|
||||
LL | #[rustc_access_level] pub mod inner {
|
||||
| ^^^^^^^^^^^^^
|
||||
LL | pub mod inner1 {
|
||||
| ^^^^^^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:6:9
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:9:9
|
||||
|
|
||||
LL | / extern "C" {
|
||||
LL | | #[rustc_access_level] static a: u8;
|
||||
LL | | #[rustc_access_level] pub fn b();
|
||||
LL | | }
|
||||
| |_________^
|
||||
LL | extern "C" {}
|
||||
| ^^^^^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:11:9
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:12:9
|
||||
|
|
||||
LL | pub trait Trait {
|
||||
| ^^^^^^^^^^^^^^^
|
||||
LL | pub trait PubTrait {
|
||||
| ^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:17:9
|
||||
error: Public: pub(self), Exported: pub(self), Reachable: pub(self), ReachableFromImplTrait: pub(self)
|
||||
--> $DIR/access_levels.rs:20:9
|
||||
|
|
||||
LL | pub struct Struct {
|
||||
LL | struct PrivStruct;
|
||||
| ^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: None
|
||||
--> $DIR/access_levels.rs:18:35
|
||||
|
|
||||
LL | #[rustc_access_level] a: u8,
|
||||
| ^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:19:35
|
||||
|
|
||||
LL | #[rustc_access_level] pub b: u8,
|
||||
| ^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:23:9
|
||||
|
|
||||
LL | pub union Union {
|
||||
| ^^^^^^^^^^^^^^^
|
||||
LL | pub union PubUnion {
|
||||
| ^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: None
|
||||
--> $DIR/access_levels.rs:24:35
|
||||
error: Public: pub(self), Exported: pub(self), Reachable: pub(self), ReachableFromImplTrait: pub(self)
|
||||
--> $DIR/access_levels.rs:25:13
|
||||
|
|
||||
LL | #[rustc_access_level] a: u8,
|
||||
| ^^^^^
|
||||
LL | a: u8,
|
||||
| ^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:25:35
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:27:13
|
||||
|
|
||||
LL | #[rustc_access_level] pub b: u8,
|
||||
| ^^^^^^^^^
|
||||
LL | pub b: u8,
|
||||
| ^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:29:9
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:31:9
|
||||
|
|
||||
LL | pub enum Enum {
|
||||
| ^^^^^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:30:35
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:33:13
|
||||
|
|
||||
LL | #[rustc_access_level] A(
|
||||
| ^
|
||||
LL | A(
|
||||
| ^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:31:39
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:35:17
|
||||
|
|
||||
LL | #[rustc_access_level] Struct,
|
||||
| ^^^^^^
|
||||
LL | PubUnion,
|
||||
| ^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:32:39
|
||||
error: Public: pub(self), Exported: pub(self), Reachable: pub(self), ReachableFromImplTrait: pub(self)
|
||||
--> $DIR/access_levels.rs:41:5
|
||||
|
|
||||
LL | #[rustc_access_level] Union,
|
||||
| ^^^^^
|
||||
LL | macro_rules! none_macro {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: None
|
||||
--> $DIR/access_levels.rs:37:27
|
||||
error: Public: pub, Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:47:5
|
||||
|
|
||||
LL | #[rustc_access_level] macro_rules! none_macro {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^
|
||||
LL | macro_rules! public_macro {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: Some(Public)
|
||||
--> $DIR/access_levels.rs:42:27
|
||||
error: Public: pub(self), Exported: pub(self), Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:52:5
|
||||
|
|
||||
LL | #[rustc_access_level] macro_rules! public_macro {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
LL | pub struct ReachableStruct {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:12:35
|
||||
error: Public: pub(self), Exported: pub(self), Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:54:9
|
||||
|
|
||||
LL | #[rustc_access_level] const A: i32;
|
||||
| ^^^^^^^^^^^^
|
||||
LL | pub a: u8,
|
||||
| ^^^^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:13:35
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:14:13
|
||||
|
|
||||
LL | #[rustc_access_level] type B;
|
||||
| ^^^^^^
|
||||
LL | const A: i32;
|
||||
| ^^^^^^^^^^^^
|
||||
|
||||
error: None
|
||||
--> $DIR/access_levels.rs:7:35
|
||||
error: Public: pub(self), Exported: pub, Reachable: pub, ReachableFromImplTrait: pub
|
||||
--> $DIR/access_levels.rs:16:13
|
||||
|
|
||||
LL | #[rustc_access_level] static a: u8;
|
||||
| ^^^^^^^^^^^^
|
||||
LL | type B;
|
||||
| ^^^^^^
|
||||
|
||||
error: Some(Exported)
|
||||
--> $DIR/access_levels.rs:8:35
|
||||
|
|
||||
LL | #[rustc_access_level] pub fn b();
|
||||
| ^^^^^^^^^^
|
||||
|
||||
error: aborting due to 20 previous errors
|
||||
error: aborting due to 17 previous errors
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue