diff options
| author | bors <bors@rust-lang.org> | 2021-02-23 07:19:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-23 07:19:41 +0000 |
| commit | cd64446196a02e593c5f50b8d863161306da43f7 (patch) | |
| tree | 6de1147cc53c807e789794cb944ab9b3cdb4c1e8 /library/alloc | |
| parent | a4e595db8f12f9ee926256745d757004b850703f (diff) | |
| parent | b1a4bca3e6a03eb59d4ef748a32448226015a2f5 (diff) | |
| download | rust-cd64446196a02e593c5f50b8d863161306da43f7.tar.gz rust-cd64446196a02e593c5f50b8d863161306da43f7.zip | |
Auto merge of #82076 - jyn514:update-bootstrap, r=Mark-Simulacrum
Update the bootstrap compiler This updates the bootstrap compiler, notably leaving out a change to enable semicolon in macro expressions lint, because stdarch still depends on the old behavior.
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/alloc/src/task.rs | 4 | ||||
| -rw-r--r-- | library/alloc/tests/slice.rs | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index c020a969f1f..d991cd722a2 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -117,7 +117,6 @@ #![feature(ptr_internals)] #![feature(rustc_attrs)] #![feature(receiver_trait)] -#![cfg_attr(bootstrap, feature(min_const_generics))] #![feature(min_specialization)] #![feature(set_ptr_value)] #![feature(slice_ptr_get)] diff --git a/library/alloc/src/task.rs b/library/alloc/src/task.rs index ab7611ae071..58a9ae77244 100644 --- a/library/alloc/src/task.rs +++ b/library/alloc/src/task.rs @@ -85,8 +85,6 @@ pub trait Wake { } } -#[cfg_attr(bootstrap, allow(rustc::ineffective_unstable_trait_impl))] -#[cfg_attr(not(bootstrap), allow(ineffective_unstable_trait_impl))] #[stable(feature = "wake_trait", since = "1.51.0")] impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for Waker { fn from(waker: Arc<W>) -> Waker { @@ -96,8 +94,6 @@ impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for Waker { } } -#[cfg_attr(bootstrap, allow(rustc::ineffective_unstable_trait_impl))] -#[cfg_attr(not(bootstrap), allow(ineffective_unstable_trait_impl))] #[stable(feature = "wake_trait", since = "1.51.0")] impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for RawWaker { fn from(waker: Arc<W>) -> RawWaker { diff --git a/library/alloc/tests/slice.rs b/library/alloc/tests/slice.rs index 777c10b1bf7..1fb4a51acfd 100644 --- a/library/alloc/tests/slice.rs +++ b/library/alloc/tests/slice.rs @@ -1798,7 +1798,7 @@ fn subslice_patterns() { macro_rules! c { ($inp:expr, $typ:ty, $out:expr $(,)?) => { - assert_eq!($out, identity::<$typ>($inp)); + assert_eq!($out, identity::<$typ>($inp)) }; } |