diff options
| author | bors <bors@rust-lang.org> | 2020-04-25 14:15:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-25 14:15:10 +0000 |
| commit | 659951c4a0d7450e43f61c61c0e87d0ceae17087 (patch) | |
| tree | 2061fef92d4dd5e6f819b4c0d9af14b34c35b7e9 /src/liballoc | |
| parent | b613c989594f1cbf0d4af1a7a153786cca7792c8 (diff) | |
| parent | 17a393ee962f6772235c8e8e3ebe777a7dae45db (diff) | |
| download | rust-659951c4a0d7450e43f61c61c0e87d0ceae17087.tar.gz rust-659951c4a0d7450e43f61c61c0e87d0ceae17087.zip | |
Auto merge of #71439 - Mark-Simulacrum:stage0-next, r=jonas-schievink
Bump bootstrap compiler This bumps the bootstrap compiler and the rustfmt that x.py fmt uses.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/sync.rs | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index a2071844d5d..f422c3f66e1 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -99,7 +99,7 @@ #![feature(internal_uninit_const)] #![feature(lang_items)] #![feature(libc)] -#![cfg_attr(not(bootstrap), feature(negative_impls))] +#![feature(negative_impls)] #![feature(new_uninit)] #![feature(nll)] #![feature(optin_builtin_traits)] diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index fb9f5faa018..8144fe0128e 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -279,7 +279,6 @@ struct RcBox<T: ?Sized> { /// type `T`. /// /// [get_mut]: #method.get_mut -#[cfg_attr(all(bootstrap, not(test)), lang = "rc")] #[cfg_attr(not(test), rustc_diagnostic_item = "Rc")] #[stable(feature = "rust1", since = "1.0.0")] pub struct Rc<T: ?Sized> { diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs index cde412bee78..adce23c42c0 100644 --- a/src/liballoc/sync.rs +++ b/src/liballoc/sync.rs @@ -207,7 +207,6 @@ macro_rules! acquire { /// counting in general. /// /// [rc_examples]: ../../std/rc/index.html#examples -#[cfg_attr(all(bootstrap, not(test)), lang = "arc")] #[cfg_attr(not(test), rustc_diagnostic_item = "Arc")] #[stable(feature = "rust1", since = "1.0.0")] pub struct Arc<T: ?Sized> { |