Bump version, upgrade bootstrap
This commit updates the version number to 1.17.0 as we're not on that version of the nightly compiler, and at the same time this updates src/stage0.txt to bootstrap from freshly minted beta compiler and beta Cargo.
This commit is contained in:
Alex Crichton
@@ -144,9 +144,7 @@ macro_rules! zero_one_impl {
|
||||
}
|
||||
)*)
|
||||
}
|
||||
zero_one_impl! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }
|
||||
#[cfg(not(stage0))]
|
||||
zero_one_impl! { u128 i128 }
|
||||
zero_one_impl! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize }
|
||||
|
||||
macro_rules! zero_one_impl_float {
|
||||
($($t:ty)*) => ($(
|
||||
@@ -1300,8 +1298,6 @@ impl i64 {
|
||||
intrinsics::mul_with_overflow }
|
||||
}
|
||||
|
||||
// SNAP
|
||||
#[cfg(not(stage0))]
|
||||
#[lang = "i128"]
|
||||
impl i128 {
|
||||
int_impl! { i128, u128, 128,
|
||||
@@ -2342,8 +2338,6 @@ impl u64 {
|
||||
intrinsics::mul_with_overflow }
|
||||
}
|
||||
|
||||
// SNAP
|
||||
#[cfg(not(stage0))]
|
||||
#[lang = "u128"]
|
||||
impl u128 {
|
||||
uint_impl! { u128, 128,
|
||||
@@ -2568,9 +2562,7 @@ macro_rules! from_str_radix_int_impl {
|
||||
}
|
||||
)*}
|
||||
}
|
||||
from_str_radix_int_impl! { isize i8 i16 i32 i64 usize u8 u16 u32 u64 }
|
||||
#[cfg(not(stage0))]
|
||||
from_str_radix_int_impl! { u128 i128 }
|
||||
from_str_radix_int_impl! { isize i8 i16 i32 i64 i128 usize u8 u16 u32 u64 u128 }
|
||||
|
||||
/// The error type returned when a checked integral type conversion fails.
|
||||
#[unstable(feature = "try_from", issue = "33417")]
|
||||
@@ -2614,50 +2606,17 @@ macro_rules! same_sign_try_from_int_impl {
|
||||
)*}
|
||||
}
|
||||
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(u64, u8, u8, u16, u32, u64, usize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(i64, i8, i8, i16, i32, i64, isize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(u64, u16, u8, u16, u32, u64, usize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(i64, i16, i8, i16, i32, i64, isize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(u64, u32, u8, u16, u32, u64, usize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(i64, i32, i8, i16, i32, i64, isize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(u64, u64, u8, u16, u32, u64, usize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(i64, i64, i8, i16, i32, i64, isize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(u64, usize, u8, u16, u32, u64, usize);
|
||||
#[cfg(stage0)]
|
||||
same_sign_try_from_int_impl!(i64, isize, i8, i16, i32, i64, isize);
|
||||
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(u128, u8, u8, u16, u32, u64, u128, usize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(i128, i8, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(u128, u16, u8, u16, u32, u64, u128, usize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(i128, i16, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(u128, u32, u8, u16, u32, u64, u128, usize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(i128, i32, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(u128, u64, u8, u16, u32, u64, u128, usize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(i128, i64, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(u128, u128, u8, u16, u32, u64, u128, usize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(i128, i128, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(u128, usize, u8, u16, u32, u64, u128, usize);
|
||||
#[cfg(not(stage0))]
|
||||
same_sign_try_from_int_impl!(i128, isize, i8, i16, i32, i64, i128, isize);
|
||||
|
||||
macro_rules! cross_sign_from_int_impl {
|
||||
@@ -2692,28 +2651,11 @@ macro_rules! cross_sign_from_int_impl {
|
||||
)*}
|
||||
}
|
||||
|
||||
#[cfg(stage0)]
|
||||
cross_sign_from_int_impl!(u8, i8, i16, i32, i64, isize);
|
||||
#[cfg(stage0)]
|
||||
cross_sign_from_int_impl!(u16, i8, i16, i32, i64, isize);
|
||||
#[cfg(stage0)]
|
||||
cross_sign_from_int_impl!(u32, i8, i16, i32, i64, isize);
|
||||
#[cfg(stage0)]
|
||||
cross_sign_from_int_impl!(u64, i8, i16, i32, i64, isize);
|
||||
#[cfg(stage0)]
|
||||
cross_sign_from_int_impl!(usize, i8, i16, i32, i64, isize);
|
||||
|
||||
#[cfg(not(stage0))]
|
||||
cross_sign_from_int_impl!(u8, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
cross_sign_from_int_impl!(u16, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
cross_sign_from_int_impl!(u32, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
cross_sign_from_int_impl!(u64, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
cross_sign_from_int_impl!(u128, i8, i16, i32, i64, i128, isize);
|
||||
#[cfg(not(stage0))]
|
||||
cross_sign_from_int_impl!(usize, i8, i16, i32, i64, i128, isize);
|
||||
|
||||
#[doc(hidden)]
|
||||
@@ -2742,9 +2684,7 @@ macro_rules! doit {
|
||||
}
|
||||
})*)
|
||||
}
|
||||
doit! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
|
||||
#[cfg(not(stage0))]
|
||||
doit! { i128 u128 }
|
||||
doit! { i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize }
|
||||
|
||||
fn from_str_radix<T: FromStrRadixHelper>(src: &str, radix: u32) -> Result<T, ParseIntError> {
|
||||
use self::IntErrorKind::*;
|
||||
@@ -2878,50 +2818,38 @@ macro_rules! impl_from {
|
||||
impl_from! { u8, u16 }
|
||||
impl_from! { u8, u32 }
|
||||
impl_from! { u8, u64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { u8, u128 }
|
||||
impl_from! { u8, usize }
|
||||
impl_from! { u16, u32 }
|
||||
impl_from! { u16, u64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { u16, u128 }
|
||||
impl_from! { u32, u64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { u32, u128 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { u64, u128 }
|
||||
|
||||
// Signed -> Signed
|
||||
impl_from! { i8, i16 }
|
||||
impl_from! { i8, i32 }
|
||||
impl_from! { i8, i64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { i8, i128 }
|
||||
impl_from! { i8, isize }
|
||||
impl_from! { i16, i32 }
|
||||
impl_from! { i16, i64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { i16, i128 }
|
||||
impl_from! { i32, i64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { i32, i128 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { i64, i128 }
|
||||
|
||||
// Unsigned -> Signed
|
||||
impl_from! { u8, i16 }
|
||||
impl_from! { u8, i32 }
|
||||
impl_from! { u8, i64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { u8, i128 }
|
||||
impl_from! { u16, i32 }
|
||||
impl_from! { u16, i64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { u16, i128 }
|
||||
impl_from! { u32, i64 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { u32, i128 }
|
||||
#[cfg(not(stage0))]
|
||||
impl_from! { u64, i128 }
|
||||
|
||||
// Note: integers can only be represented with full precision in a float if
|
||||
|
||||
@@ -297,9 +297,7 @@ macro_rules! wrapping_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
wrapping_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
#[cfg(not(stage0))]
|
||||
wrapping_impl! { u128 i128 }
|
||||
wrapping_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
|
||||
mod shift_max {
|
||||
#![allow(non_upper_case_globals)]
|
||||
|
||||
Reference in New Issue
Block a user