From e88d79ca41181f5f306fe2ef25510318556bc963 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Wed, 26 Aug 2020 10:16:59 +0200 Subject: [PATCH 1/3] bump version to 1.48 --- src/bootstrap/channel.rs | 2 +- src/stage0.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index 51a9b0e0a52e1..2a461170b5cce 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -13,7 +13,7 @@ use build_helper::output; use crate::Build; // The version number -pub const CFG_RELEASE_NUM: &str = "1.47.0"; +pub const CFG_RELEASE_NUM: &str = "1.48.0"; pub struct GitInfo { inner: Option, diff --git a/src/stage0.txt b/src/stage0.txt index 4234ce4bac07d..f695b75c24d11 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,7 +12,7 @@ # source tarball for a stable release you'll likely see `1.x.0` for rustc and # `0.(x+1).0` for Cargo where they were released on `date`. -date: 2020-07-16 +date: 2020-08-26 rustc: beta cargo: beta From 3e16d4af7f6b0524434e758331a7cb3013a69791 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Wed, 26 Aug 2020 10:17:31 +0200 Subject: [PATCH 2/3] apply bootstrap cfgs --- library/core/src/array/mod.rs | 1 - library/core/src/convert/mod.rs | 2 +- library/core/src/future/future.rs | 2 +- library/core/src/future/mod.rs | 4 ++-- library/core/src/iter/traits/collect.rs | 2 +- library/core/src/iter/traits/iterator.rs | 2 +- library/core/src/lib.rs | 2 +- library/core/src/marker.rs | 2 +- library/core/src/ops/range.rs | 14 +++++++------- library/core/src/ops/try.rs | 6 +++--- library/core/src/option.rs | 4 ++-- library/core/src/pin.rs | 2 +- library/core/src/result.rs | 4 ++-- library/core/src/task/poll.rs | 4 ++-- 14 files changed, 25 insertions(+), 26 deletions(-) diff --git a/library/core/src/array/mod.rs b/library/core/src/array/mod.rs index 88795d8429d29..f85be5584e3f1 100644 --- a/library/core/src/array/mod.rs +++ b/library/core/src/array/mod.rs @@ -362,7 +362,6 @@ macro_rules! array_impl_default { array_impl_default! {32, T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T} -#[cfg(not(bootstrap))] #[lang = "array"] impl [T; N] { /// Returns an array of the same size as `self`, with function `f` applied to each element diff --git a/library/core/src/convert/mod.rs b/library/core/src/convert/mod.rs index fcd07befae504..5f10a2eb023a0 100644 --- a/library/core/src/convert/mod.rs +++ b/library/core/src/convert/mod.rs @@ -385,7 +385,7 @@ pub trait Into: Sized { ))] pub trait From: Sized { /// Performs the conversion. - #[cfg_attr(not(bootstrap), lang = "from")] + #[lang = "from"] #[stable(feature = "rust1", since = "1.0.0")] fn from(_: T) -> Self; } diff --git a/library/core/src/future/future.rs b/library/core/src/future/future.rs index 8169c146137c2..d9b91acc3ad7b 100644 --- a/library/core/src/future/future.rs +++ b/library/core/src/future/future.rs @@ -96,7 +96,7 @@ pub trait Future { /// [`Context`]: ../task/struct.Context.html /// [`Waker`]: ../task/struct.Waker.html /// [`Waker::wake`]: ../task/struct.Waker.html#method.wake - #[cfg_attr(not(bootstrap), lang = "poll")] + #[lang = "poll"] #[stable(feature = "futures_api", since = "1.36.0")] fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll; } diff --git a/library/core/src/future/mod.rs b/library/core/src/future/mod.rs index d44ef857c133a..8b3df76f71fdd 100644 --- a/library/core/src/future/mod.rs +++ b/library/core/src/future/mod.rs @@ -53,7 +53,7 @@ unsafe impl Sync for ResumeTy {} /// This function returns a `GenFuture` underneath, but hides it in `impl Trait` to give /// better error messages (`impl Future` rather than `GenFuture<[closure.....]>`). // This is `const` to avoid extra errors after we recover from `const async fn` -#[cfg_attr(not(bootstrap), lang = "from_generator")] +#[lang = "from_generator"] #[doc(hidden)] #[unstable(feature = "gen_future", issue = "50547")] #[inline] @@ -86,7 +86,7 @@ where GenFuture(gen) } -#[cfg_attr(not(bootstrap), lang = "get_context")] +#[lang = "get_context"] #[doc(hidden)] #[unstable(feature = "gen_future", issue = "50547")] #[inline] diff --git a/library/core/src/iter/traits/collect.rs b/library/core/src/iter/traits/collect.rs index 84c7787a18fd1..75827d785e10e 100644 --- a/library/core/src/iter/traits/collect.rs +++ b/library/core/src/iter/traits/collect.rs @@ -235,7 +235,7 @@ pub trait IntoIterator { /// assert_eq!(Some(3), iter.next()); /// assert_eq!(None, iter.next()); /// ``` - #[cfg_attr(not(bootstrap), lang = "into_iter")] + #[lang = "into_iter"] #[stable(feature = "rust1", since = "1.0.0")] fn into_iter(self) -> Self::IntoIter; } diff --git a/library/core/src/iter/traits/iterator.rs b/library/core/src/iter/traits/iterator.rs index 32e43ed42f385..aca6699b9efbb 100644 --- a/library/core/src/iter/traits/iterator.rs +++ b/library/core/src/iter/traits/iterator.rs @@ -130,7 +130,7 @@ pub trait Iterator { /// assert_eq!(None, iter.next()); /// assert_eq!(None, iter.next()); /// ``` - #[cfg_attr(not(bootstrap), lang = "next")] + #[lang = "next"] #[stable(feature = "rust1", since = "1.0.0")] fn next(&mut self) -> Option; diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index 99f8cc66638f3..aef82a5aec5d0 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -98,7 +98,7 @@ #![feature(custom_inner_attributes)] #![feature(decl_macro)] #![feature(doc_cfg)] -#![cfg_attr(not(bootstrap), feature(doc_spotlight))] +#![feature(doc_spotlight)] #![feature(duration_consts_2)] #![feature(extern_types)] #![feature(fundamental)] diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs index 9326aaf56847c..27a3a2cf91162 100644 --- a/library/core/src/marker.rs +++ b/library/core/src/marker.rs @@ -708,7 +708,7 @@ mod impls { pub trait DiscriminantKind { /// The type of the discriminant, which must satisfy the trait /// bounds required by `mem::Discriminant`. - #[cfg_attr(not(bootstrap), lang = "discriminant_type")] + #[lang = "discriminant_type"] type Discriminant: Clone + Copy + Debug + Eq + PartialEq + Hash + Send + Sync + Unpin; } diff --git a/library/core/src/ops/range.rs b/library/core/src/ops/range.rs index d10829832dd16..2eaf7601e54de 100644 --- a/library/core/src/ops/range.rs +++ b/library/core/src/ops/range.rs @@ -36,7 +36,7 @@ use crate::hash::Hash; /// ``` /// /// [slicing index]: crate::slice::SliceIndex -#[cfg_attr(not(bootstrap), lang = "RangeFull")] +#[lang = "RangeFull"] #[doc(alias = "..")] #[derive(Copy, Clone, Default, PartialEq, Eq, Hash)] #[stable(feature = "rust1", since = "1.0.0")] @@ -69,7 +69,7 @@ impl fmt::Debug for RangeFull { /// assert_eq!(arr[1.. 3], [ 1,2 ]); // Range /// assert_eq!(arr[1..=3], [ 1,2,3 ]); /// ``` -#[cfg_attr(not(bootstrap), lang = "Range")] +#[lang = "Range"] #[doc(alias = "..")] #[derive(Clone, Default, PartialEq, Eq, Hash)] // not Copy -- see #27186 #[stable(feature = "rust1", since = "1.0.0")] @@ -172,7 +172,7 @@ impl> Range { /// assert_eq!(arr[1.. 3], [ 1,2 ]); /// assert_eq!(arr[1..=3], [ 1,2,3 ]); /// ``` -#[cfg_attr(not(bootstrap), lang = "RangeFrom")] +#[lang = "RangeFrom"] #[doc(alias = "..")] #[derive(Clone, PartialEq, Eq, Hash)] // not Copy -- see #27186 #[stable(feature = "rust1", since = "1.0.0")] @@ -253,7 +253,7 @@ impl> RangeFrom { /// ``` /// /// [slicing index]: crate::slice::SliceIndex -#[cfg_attr(not(bootstrap), lang = "RangeTo")] +#[lang = "RangeTo"] #[doc(alias = "..")] #[derive(Copy, Clone, PartialEq, Eq, Hash)] #[stable(feature = "rust1", since = "1.0.0")] @@ -322,7 +322,7 @@ impl> RangeTo { /// assert_eq!(arr[1.. 3], [ 1,2 ]); /// assert_eq!(arr[1..=3], [ 1,2,3 ]); // RangeInclusive /// ``` -#[cfg_attr(not(bootstrap), lang = "RangeInclusive")] +#[lang = "RangeInclusive"] #[doc(alias = "..=")] #[derive(Clone, PartialEq, Eq, Hash)] // not Copy -- see #27186 #[stable(feature = "inclusive_range", since = "1.26.0")] @@ -354,7 +354,7 @@ impl RangeInclusive { /// /// assert_eq!(3..=5, RangeInclusive::new(3, 5)); /// ``` - #[cfg_attr(not(bootstrap), lang = "range_inclusive_new")] + #[lang = "range_inclusive_new"] #[stable(feature = "inclusive_range_methods", since = "1.27.0")] #[inline] #[rustc_promotable] @@ -543,7 +543,7 @@ impl> RangeInclusive { /// ``` /// /// [slicing index]: crate::slice::SliceIndex -#[cfg_attr(not(bootstrap), lang = "RangeToInclusive")] +#[lang = "RangeToInclusive"] #[doc(alias = "..=")] #[derive(Copy, Clone, PartialEq, Eq, Hash)] #[stable(feature = "inclusive_range", since = "1.26.0")] diff --git a/library/core/src/ops/try.rs b/library/core/src/ops/try.rs index e6b05cc641e35..3bede5699781c 100644 --- a/library/core/src/ops/try.rs +++ b/library/core/src/ops/try.rs @@ -43,19 +43,19 @@ pub trait Try { /// in the return type of the enclosing scope (which must itself implement /// `Try`). Specifically, the value `X::from_error(From::from(e))` /// is returned, where `X` is the return type of the enclosing function. - #[cfg_attr(not(bootstrap), lang = "into_result")] + #[lang = "into_result"] #[unstable(feature = "try_trait", issue = "42327")] fn into_result(self) -> Result; /// Wrap an error value to construct the composite result. For example, /// `Result::Err(x)` and `Result::from_error(x)` are equivalent. - #[cfg_attr(not(bootstrap), lang = "from_error")] + #[lang = "from_error"] #[unstable(feature = "try_trait", issue = "42327")] fn from_error(v: Self::Error) -> Self; /// Wrap an OK value to construct the composite result. For example, /// `Result::Ok(x)` and `Result::from_ok(x)` are equivalent. - #[cfg_attr(not(bootstrap), lang = "from_ok")] + #[lang = "from_ok"] #[unstable(feature = "try_trait", issue = "42327")] fn from_ok(v: Self::Ok) -> Self; } diff --git a/library/core/src/option.rs b/library/core/src/option.rs index b6aa2c6697123..dd7556758be7d 100644 --- a/library/core/src/option.rs +++ b/library/core/src/option.rs @@ -144,11 +144,11 @@ use crate::{ #[stable(feature = "rust1", since = "1.0.0")] pub enum Option { /// No value - #[cfg_attr(not(bootstrap), lang = "None")] + #[lang = "None"] #[stable(feature = "rust1", since = "1.0.0")] None, /// Some value `T` - #[cfg_attr(not(bootstrap), lang = "Some")] + #[lang = "Some"] #[stable(feature = "rust1", since = "1.0.0")] Some(#[stable(feature = "rust1", since = "1.0.0")] T), } diff --git a/library/core/src/pin.rs b/library/core/src/pin.rs index 290aa797fd964..8f60c4787d459 100644 --- a/library/core/src/pin.rs +++ b/library/core/src/pin.rs @@ -555,7 +555,7 @@ impl Pin

{ /// ``` /// /// [`mem::swap`]: crate::mem::swap - #[cfg_attr(not(bootstrap), lang = "new_unchecked")] + #[lang = "new_unchecked"] #[stable(feature = "pin", since = "1.33.0")] #[inline(always)] pub unsafe fn new_unchecked(pointer: P) -> Pin

{ diff --git a/library/core/src/result.rs b/library/core/src/result.rs index ade5472717dde..ce0fc628e1114 100644 --- a/library/core/src/result.rs +++ b/library/core/src/result.rs @@ -240,12 +240,12 @@ use crate::{convert, fmt}; #[stable(feature = "rust1", since = "1.0.0")] pub enum Result { /// Contains the success value - #[cfg_attr(not(bootstrap), lang = "Ok")] + #[lang = "Ok"] #[stable(feature = "rust1", since = "1.0.0")] Ok(#[stable(feature = "rust1", since = "1.0.0")] T), /// Contains the error value - #[cfg_attr(not(bootstrap), lang = "Err")] + #[lang = "Err"] #[stable(feature = "rust1", since = "1.0.0")] Err(#[stable(feature = "rust1", since = "1.0.0")] E), } diff --git a/library/core/src/task/poll.rs b/library/core/src/task/poll.rs index fea396d20ff4b..9383e7c45fa55 100644 --- a/library/core/src/task/poll.rs +++ b/library/core/src/task/poll.rs @@ -10,7 +10,7 @@ use crate::result::Result; #[stable(feature = "futures_api", since = "1.36.0")] pub enum Poll { /// Represents that a value is immediately ready. - #[cfg_attr(not(bootstrap), lang = "Ready")] + #[lang = "Ready"] #[stable(feature = "futures_api", since = "1.36.0")] Ready(#[stable(feature = "futures_api", since = "1.36.0")] T), @@ -19,7 +19,7 @@ pub enum Poll { /// When a function returns `Pending`, the function *must* also /// ensure that the current task is scheduled to be awoken when /// progress can be made. - #[cfg_attr(not(bootstrap), lang = "Pending")] + #[lang = "Pending"] #[stable(feature = "futures_api", since = "1.36.0")] Pending, } From 1b6590c9f4104df7d168474edf3c0ab966b44108 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Thu, 27 Aug 2020 10:58:34 +0200 Subject: [PATCH 3/3] forgot to remove a cfg(not(bootstrap)) --- library/std/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 1142b74ff0dc4..0797585e3df3f 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -247,7 +247,7 @@ #![feature(doc_cfg)] #![feature(doc_keyword)] #![feature(doc_masked)] -#![cfg_attr(not(bootstrap), feature(doc_spotlight))] +#![feature(doc_spotlight)] #![feature(dropck_eyepatch)] #![feature(duration_constants)] #![feature(exact_size_is_empty)]