Rustup to rustc 1.30.0-nightly (d5a448b3f
2018-08-13) and update Cargo.lock
This commit is contained in:
parent
a6835385fb
commit
3f4926f43f
2 changed files with 186 additions and 218 deletions
|
@ -1,6 +1,6 @@
|
|||
From 601b4bf31350a620a9de8a50ad699852331fa17e Mon Sep 17 00:00:00 2001
|
||||
From 78c557ab91915384c4de6b743fa67dedcb0263c9 Mon Sep 17 00:00:00 2001
|
||||
From: bjorn3 <bjorn3@users.noreply.github.com>
|
||||
Date: Thu, 19 Jul 2018 18:34:03 +0200
|
||||
Date: Tue, 14 Aug 2018 09:59:32 +0200
|
||||
Subject: [PATCH] Disable u128 and i128 in libcore
|
||||
|
||||
---
|
||||
|
@ -14,26 +14,22 @@ Subject: [PATCH] Disable u128 and i128 in libcore
|
|||
src/libcore/lib.rs | 2 -
|
||||
src/libcore/marker.rs | 4 +-
|
||||
src/libcore/mem.rs | 2 -
|
||||
src/libcore/num/i128.rs | 17 ---------
|
||||
src/libcore/num/mod.rs | 87 +++++++++++++-------------------------------
|
||||
src/libcore/num/u128.rs | 16 --------
|
||||
src/libcore/num/mod.rs | 92 +++++++++++++-------------------------------
|
||||
src/libcore/num/wrapping.rs | 14 +++----
|
||||
src/libcore/ops/arith.rs | 22 +++++------
|
||||
src/libcore/ops/bit.rs | 30 ++++++---------
|
||||
src/libcore/tests/iter.rs | 15 --------
|
||||
src/libcore/tests/num/mod.rs | 18 ---------
|
||||
src/libcore/time.rs | 51 --------------------------
|
||||
19 files changed, 62 insertions(+), 257 deletions(-)
|
||||
delete mode 100644 src/libcore/num/i128.rs
|
||||
delete mode 100644 src/libcore/num/u128.rs
|
||||
src/libcore/time.rs | 51 ------------------------
|
||||
17 files changed, 62 insertions(+), 229 deletions(-)
|
||||
|
||||
diff --git a/src/libcore/clone.rs b/src/libcore/clone.rs
|
||||
index 3b15ba2b4a..de08ce0289 100644
|
||||
index 3b15ba2..de08ce0 100644
|
||||
--- a/src/libcore/clone.rs
|
||||
+++ b/src/libcore/clone.rs
|
||||
@@ -172,8 +172,8 @@ mod impls {
|
||||
}
|
||||
|
||||
|
||||
impl_clone! {
|
||||
- usize u8 u16 u32 u64 u128
|
||||
- isize i8 i16 i32 i64 i128
|
||||
|
@ -43,38 +39,38 @@ index 3b15ba2b4a..de08ce0289 100644
|
|||
bool char
|
||||
}
|
||||
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs
|
||||
index 3626a266ad..4106432a41 100644
|
||||
index 58d6c4f..a6e6496 100644
|
||||
--- a/src/libcore/cmp.rs
|
||||
+++ b/src/libcore/cmp.rs
|
||||
@@ -798,7 +798,7 @@ mod impls {
|
||||
@@ -800,7 +800,7 @@ mod impls {
|
||||
}
|
||||
|
||||
|
||||
partial_eq_impl! {
|
||||
- bool char usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64
|
||||
+ bool char usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64
|
||||
}
|
||||
|
||||
|
||||
macro_rules! eq_impl {
|
||||
@@ -808,7 +808,7 @@ mod impls {
|
||||
@@ -810,7 +810,7 @@ mod impls {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
- eq_impl! { () bool char usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+ eq_impl! { () bool char usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
macro_rules! partial_ord_impl {
|
||||
($($t:ty)*) => ($(
|
||||
@@ -897,7 +897,7 @@ mod impls {
|
||||
@@ -899,7 +899,7 @@ mod impls {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
- ord_impl! { char usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+ ord_impl! { char usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
#[unstable(feature = "never_type", issue = "35121")]
|
||||
impl PartialEq for ! {
|
||||
diff --git a/src/libcore/default.rs b/src/libcore/default.rs
|
||||
index ab36e29b1e..1926719657 100644
|
||||
index ab36e29..1926719 100644
|
||||
--- a/src/libcore/default.rs
|
||||
+++ b/src/libcore/default.rs
|
||||
@@ -145,14 +145,12 @@ default_impl! { u8, 0, "Returns the default value of `0`" }
|
||||
|
@ -82,18 +78,18 @@ index ab36e29b1e..1926719657 100644
|
|||
default_impl! { u32, 0, "Returns the default value of `0`" }
|
||||
default_impl! { u64, 0, "Returns the default value of `0`" }
|
||||
-default_impl! { u128, 0, "Returns the default value of `0`" }
|
||||
|
||||
|
||||
default_impl! { isize, 0, "Returns the default value of `0`" }
|
||||
default_impl! { i8, 0, "Returns the default value of `0`" }
|
||||
default_impl! { i16, 0, "Returns the default value of `0`" }
|
||||
default_impl! { i32, 0, "Returns the default value of `0`" }
|
||||
default_impl! { i64, 0, "Returns the default value of `0`" }
|
||||
-default_impl! { i128, 0, "Returns the default value of `0`" }
|
||||
|
||||
|
||||
default_impl! { f32, 0.0f32, "Returns the default value of `0.0`" }
|
||||
default_impl! { f64, 0.0f64, "Returns the default value of `0.0`" }
|
||||
diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs
|
||||
index 51391fa50d..140255ea7e 100644
|
||||
index 51391fa..140255e 100644
|
||||
--- a/src/libcore/fmt/num.rs
|
||||
+++ b/src/libcore/fmt/num.rs
|
||||
@@ -29,7 +29,6 @@ trait Int: PartialEq + PartialOrd + Div<Output=Self> + Rem<Output=Self> +
|
||||
|
@ -102,7 +98,7 @@ index 51391fa50d..140255ea7e 100644
|
|||
fn to_u64(&self) -> u64;
|
||||
- fn to_u128(&self) -> u128;
|
||||
}
|
||||
|
||||
|
||||
macro_rules! doit {
|
||||
@@ -40,10 +39,9 @@ macro_rules! doit {
|
||||
fn to_u16(&self) -> u16 { *self as u16 }
|
||||
|
@ -113,7 +109,7 @@ index 51391fa50d..140255ea7e 100644
|
|||
}
|
||||
-doit! { i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize }
|
||||
+doit! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
|
||||
|
||||
|
||||
/// A type that represents a specific radix
|
||||
#[doc(hidden)]
|
||||
@@ -184,7 +182,6 @@ integer! { i8, u8 }
|
||||
|
@ -121,11 +117,11 @@ index 51391fa50d..140255ea7e 100644
|
|||
integer! { i32, u32 }
|
||||
integer! { i64, u64 }
|
||||
-integer! { i128, u128 }
|
||||
|
||||
|
||||
const DEC_DIGITS_LUT: &'static[u8] =
|
||||
b"0001020304050607080910111213141516171819\
|
||||
@@ -260,7 +257,6 @@ macro_rules! impl_Display {
|
||||
|
||||
|
||||
impl_Display!(i8, u8, i16, u16, i32, u32: to_u32);
|
||||
impl_Display!(i64, u64: to_u64);
|
||||
-impl_Display!(i128, u128: to_u128);
|
||||
|
@ -133,7 +129,7 @@ index 51391fa50d..140255ea7e 100644
|
|||
impl_Display!(isize, usize: to_u16);
|
||||
#[cfg(target_pointer_width = "32")]
|
||||
diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs
|
||||
index e6f8dfffd6..2670d55537 100644
|
||||
index e7907e0..84b700c 100644
|
||||
--- a/src/libcore/hash/mod.rs
|
||||
+++ b/src/libcore/hash/mod.rs
|
||||
@@ -306,12 +306,6 @@ pub trait Hasher {
|
||||
|
@ -182,17 +178,17 @@ index e6f8dfffd6..2670d55537 100644
|
|||
fn write_isize(&mut self, i: isize) {
|
||||
(**self).write_isize(i)
|
||||
}
|
||||
@@ -577,8 +559,6 @@ mod impls {
|
||||
@@ -587,8 +569,6 @@ mod impls {
|
||||
(i32, write_i32),
|
||||
(i64, write_i64),
|
||||
(isize, write_isize),
|
||||
- (u128, write_u128),
|
||||
- (i128, write_i128),
|
||||
}
|
||||
|
||||
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
diff --git a/src/libcore/iter/range.rs b/src/libcore/iter/range.rs
|
||||
index 651c7a35d4..3708b8ea95 100644
|
||||
index 651c7a3..3708b8e 100644
|
||||
--- a/src/libcore/iter/range.rs
|
||||
+++ b/src/libcore/iter/range.rs
|
||||
@@ -175,7 +175,6 @@ step_impl_signed!([i64: u64]);
|
||||
|
@ -200,48 +196,48 @@ index 651c7a35d4..3708b8ea95 100644
|
|||
#[cfg(not(target_pointer_width = "64"))]
|
||||
step_impl_no_between!(u64 i64);
|
||||
-step_impl_no_between!(u128 i128);
|
||||
|
||||
|
||||
macro_rules! range_exact_iter_impl {
|
||||
($($t:ty)*) => ($(
|
||||
diff --git a/src/libcore/iter/traits.rs b/src/libcore/iter/traits.rs
|
||||
index 4b2c1aa551..ec3991fa01 100644
|
||||
index 4b2c1aa..ec3991f 100644
|
||||
--- a/src/libcore/iter/traits.rs
|
||||
+++ b/src/libcore/iter/traits.rs
|
||||
@@ -843,7 +843,7 @@ macro_rules! float_sum_product {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-integer_sum_product! { i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize }
|
||||
+integer_sum_product! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
|
||||
float_sum_product! { f32 f64 }
|
||||
|
||||
|
||||
/// An iterator adapter that produces output as long as the underlying
|
||||
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
|
||||
index bdeb6ce426..3bec7a240c 100644
|
||||
index c7618b9..31b33a2 100644
|
||||
--- a/src/libcore/lib.rs
|
||||
+++ b/src/libcore/lib.rs
|
||||
@@ -146,14 +146,12 @@ mod uint_macros;
|
||||
@@ -144,14 +144,12 @@ mod uint_macros;
|
||||
#[path = "num/i16.rs"] pub mod i16;
|
||||
#[path = "num/i32.rs"] pub mod i32;
|
||||
#[path = "num/i64.rs"] pub mod i64;
|
||||
-#[path = "num/i128.rs"] pub mod i128;
|
||||
|
||||
|
||||
#[path = "num/usize.rs"] pub mod usize;
|
||||
#[path = "num/u8.rs"] pub mod u8;
|
||||
#[path = "num/u16.rs"] pub mod u16;
|
||||
#[path = "num/u32.rs"] pub mod u32;
|
||||
#[path = "num/u64.rs"] pub mod u64;
|
||||
-#[path = "num/u128.rs"] pub mod u128;
|
||||
|
||||
|
||||
#[path = "num/f32.rs"] pub mod f32;
|
||||
#[path = "num/f64.rs"] pub mod f64;
|
||||
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
|
||||
index 4f37b46258..2e8d514700 100644
|
||||
index d18e167..ec2edc1 100644
|
||||
--- a/src/libcore/marker.rs
|
||||
+++ b/src/libcore/marker.rs
|
||||
@@ -649,8 +649,8 @@ mod copy_impls {
|
||||
}
|
||||
|
||||
|
||||
impl_copy! {
|
||||
- usize u8 u16 u32 u64 u128
|
||||
- isize i8 i16 i32 i64 i128
|
||||
|
@ -251,7 +247,7 @@ index 4f37b46258..2e8d514700 100644
|
|||
bool char
|
||||
}
|
||||
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
|
||||
index 8fb4e0d6a0..e9621d723d 100644
|
||||
index 8a74e7c..642fffa 100644
|
||||
--- a/src/libcore/mem.rs
|
||||
+++ b/src/libcore/mem.rs
|
||||
@@ -196,12 +196,10 @@ pub fn forget<T>(t: T) {
|
||||
|
@ -267,31 +263,8 @@ index 8fb4e0d6a0..e9621d723d 100644
|
|||
/// f32 | 4
|
||||
/// f64 | 8
|
||||
/// char | 4
|
||||
diff --git a/src/libcore/num/i128.rs b/src/libcore/num/i128.rs
|
||||
deleted file mode 100644
|
||||
index 989376d1ac..0000000000
|
||||
--- a/src/libcore/num/i128.rs
|
||||
+++ /dev/null
|
||||
@@ -1,17 +0,0 @@
|
||||
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
-// file at the top-level directory of this distribution and at
|
||||
-// http://rust-lang.org/COPYRIGHT.
|
||||
-//
|
||||
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
-// option. This file may not be copied, modified, or distributed
|
||||
-// except according to those terms.
|
||||
-
|
||||
-//! The 128-bit signed integer type.
|
||||
-//!
|
||||
-//! *[See also the `i128` primitive type](../../std/primitive.i128.html).*
|
||||
-
|
||||
-#![stable(feature = "i128", since = "1.26.0")]
|
||||
-
|
||||
-int_module! { i128, #[stable(feature = "i128", since="1.26.0")] }
|
||||
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
|
||||
index 0b8f8f0703..584d24130e 100644
|
||||
index eb63966..eb06710 100644
|
||||
--- a/src/libcore/num/mod.rs
|
||||
+++ b/src/libcore/num/mod.rs
|
||||
@@ -95,7 +95,6 @@ nonzero_integers! {
|
||||
|
@ -301,59 +274,64 @@ index 0b8f8f0703..584d24130e 100644
|
|||
- NonZeroU128(u128);
|
||||
NonZeroUsize(usize);
|
||||
}
|
||||
|
||||
@@ -1954,12 +1953,6 @@ impl i64 {
|
||||
int_impl! { i64, i64, u64, 64, -9223372036854775808, 9223372036854775807, "", "" }
|
||||
|
||||
@@ -2025,15 +2024,6 @@ impl i64 {
|
||||
"0x6a2c48091e6a2c48" }
|
||||
}
|
||||
|
||||
|
||||
-#[lang = "i128"]
|
||||
-impl i128 {
|
||||
- int_impl! { i128, i128, u128, 128, -170141183460469231731687303715884105728,
|
||||
- 170141183460469231731687303715884105727, "", "" }
|
||||
- 170141183460469231731687303715884105727, "", "", 16,
|
||||
- "0x13f40000000000000000000000004f76", "0x4f7613f4", "0x12345678901234567890123456789012",
|
||||
- "0x12907856341290785634129078563412", "0x48091e6a2c48091e6a2c48091e6a2c48"
|
||||
- }
|
||||
-}
|
||||
-
|
||||
#[cfg(target_pointer_width = "16")]
|
||||
#[lang = "isize"]
|
||||
impl isize {
|
||||
@@ -4100,11 +4093,6 @@ impl u64 {
|
||||
uint_impl! { u64, u64, 64, 18446744073709551615, "", "" }
|
||||
@@ -4157,13 +4147,6 @@ impl u64 {
|
||||
"0x1234567890123456", "0x5634129078563412", "0x6a2c48091e6a2c48" }
|
||||
}
|
||||
|
||||
|
||||
-#[lang = "u128"]
|
||||
-impl u128 {
|
||||
- uint_impl! { u128, u128, 128, 340282366920938463463374607431768211455, "", "" }
|
||||
- uint_impl! { u128, u128, 128, 340282366920938463463374607431768211455, "", "", 16,
|
||||
- "0x13f40000000000000000000000004f76", "0x4f7613f4", "0x12345678901234567890123456789012",
|
||||
- "0x12907856341290785634129078563412", "0x48091e6a2c48091e6a2c48091e6a2c48" }
|
||||
-}
|
||||
-
|
||||
#[cfg(target_pointer_width = "16")]
|
||||
#[lang = "usize"]
|
||||
impl usize {
|
||||
@@ -4183,7 +4171,7 @@ macro_rules! from_str_radix_int_impl {
|
||||
@@ -4244,7 +4227,7 @@ macro_rules! from_str_radix_int_impl {
|
||||
}
|
||||
)*}
|
||||
}
|
||||
-from_str_radix_int_impl! { isize i8 i16 i32 i64 i128 usize u8 u16 u32 u64 u128 }
|
||||
+from_str_radix_int_impl! { isize i8 i16 i32 i64 usize u8 u16 u32 u64 }
|
||||
|
||||
|
||||
/// The error type returned when a checked integral type conversion fails.
|
||||
#[unstable(feature = "try_from", issue = "33417")]
|
||||
@@ -4299,30 +4287,25 @@ macro_rules! rev {
|
||||
@@ -4360,30 +4343,25 @@ macro_rules! rev {
|
||||
try_from_upper_bounded!(u16, u8);
|
||||
try_from_upper_bounded!(u32, u16, u8);
|
||||
try_from_upper_bounded!(u64, u32, u16, u8);
|
||||
-try_from_upper_bounded!(u128, u64, u32, u16, u8);
|
||||
|
||||
|
||||
try_from_both_bounded!(i16, i8);
|
||||
try_from_both_bounded!(i32, i16, i8);
|
||||
try_from_both_bounded!(i64, i32, i16, i8);
|
||||
-try_from_both_bounded!(i128, i64, i32, i16, i8);
|
||||
|
||||
|
||||
// unsigned-to-signed
|
||||
try_from_upper_bounded!(u8, i8);
|
||||
try_from_upper_bounded!(u16, i8, i16);
|
||||
try_from_upper_bounded!(u32, i8, i16, i32);
|
||||
try_from_upper_bounded!(u64, i8, i16, i32, i64);
|
||||
-try_from_upper_bounded!(u128, i8, i16, i32, i64, i128);
|
||||
|
||||
|
||||
// signed-to-unsigned
|
||||
-try_from_lower_bounded!(i8, u8, u16, u32, u64, u128);
|
||||
-try_from_lower_bounded!(i16, u16, u32, u64, u128);
|
||||
|
@ -368,63 +346,63 @@ index 0b8f8f0703..584d24130e 100644
|
|||
try_from_both_bounded!(i32, u16, u8);
|
||||
try_from_both_bounded!(i64, u32, u16, u8);
|
||||
-try_from_both_bounded!(i128, u64, u32, u16, u8);
|
||||
|
||||
|
||||
// usize/isize
|
||||
try_from_upper_bounded!(usize, isize);
|
||||
@@ -4334,21 +4317,21 @@ mod ptr_try_from_impls {
|
||||
@@ -4395,21 +4373,21 @@ mod ptr_try_from_impls {
|
||||
use convert::TryFrom;
|
||||
|
||||
|
||||
try_from_upper_bounded!(usize, u8);
|
||||
- try_from_unbounded!(usize, u16, u32, u64, u128);
|
||||
+ try_from_unbounded!(usize, u16, u32, u64);
|
||||
try_from_upper_bounded!(usize, i8, i16);
|
||||
- try_from_unbounded!(usize, i32, i64, i128);
|
||||
+ try_from_unbounded!(usize, i32, i64);
|
||||
|
||||
|
||||
try_from_both_bounded!(isize, u8);
|
||||
- try_from_lower_bounded!(isize, u16, u32, u64, u128);
|
||||
+ try_from_lower_bounded!(isize, u16, u32, u64);
|
||||
try_from_both_bounded!(isize, i8);
|
||||
- try_from_unbounded!(isize, i16, i32, i64, i128);
|
||||
+ try_from_unbounded!(isize, i16, i32, i64);
|
||||
|
||||
|
||||
- rev!(try_from_upper_bounded, usize, u32, u64, u128);
|
||||
+ rev!(try_from_upper_bounded, usize, u32, u64);
|
||||
rev!(try_from_lower_bounded, usize, i8, i16);
|
||||
- rev!(try_from_both_bounded, usize, i32, i64, i128);
|
||||
+ rev!(try_from_both_bounded, usize, i32, i64);
|
||||
|
||||
|
||||
- rev!(try_from_upper_bounded, isize, u16, u32, u64, u128);
|
||||
- rev!(try_from_both_bounded, isize, i32, i64, i128);
|
||||
+ rev!(try_from_upper_bounded, isize, u16, u32, u64);
|
||||
+ rev!(try_from_both_bounded, isize, i32, i64);
|
||||
}
|
||||
|
||||
|
||||
#[cfg(target_pointer_width = "32")]
|
||||
@@ -4357,24 +4340,24 @@ mod ptr_try_from_impls {
|
||||
@@ -4418,24 +4396,24 @@ mod ptr_try_from_impls {
|
||||
use convert::TryFrom;
|
||||
|
||||
|
||||
try_from_upper_bounded!(usize, u8, u16);
|
||||
- try_from_unbounded!(usize, u32, u64, u128);
|
||||
+ try_from_unbounded!(usize, u32, u64);
|
||||
try_from_upper_bounded!(usize, i8, i16, i32);
|
||||
- try_from_unbounded!(usize, i64, i128);
|
||||
+ try_from_unbounded!(usize, i64);
|
||||
|
||||
|
||||
try_from_both_bounded!(isize, u8, u16);
|
||||
- try_from_lower_bounded!(isize, u32, u64, u128);
|
||||
+ try_from_lower_bounded!(isize, u32, u64);
|
||||
try_from_both_bounded!(isize, i8, i16);
|
||||
- try_from_unbounded!(isize, i32, i64, i128);
|
||||
+ try_from_unbounded!(isize, i32, i64);
|
||||
|
||||
|
||||
rev!(try_from_unbounded, usize, u32);
|
||||
- rev!(try_from_upper_bounded, usize, u64, u128);
|
||||
+ rev!(try_from_upper_bounded, usize, u64);
|
||||
rev!(try_from_lower_bounded, usize, i8, i16, i32);
|
||||
- rev!(try_from_both_bounded, usize, i64, i128);
|
||||
+ rev!(try_from_both_bounded, usize, i64);
|
||||
|
||||
|
||||
rev!(try_from_unbounded, isize, u16);
|
||||
- rev!(try_from_upper_bounded, isize, u32, u64, u128);
|
||||
+ rev!(try_from_upper_bounded, isize, u32, u64);
|
||||
|
@ -432,47 +410,47 @@ index 0b8f8f0703..584d24130e 100644
|
|||
- rev!(try_from_both_bounded, isize, i64, i128);
|
||||
+ rev!(try_from_both_bounded, isize, i64);
|
||||
}
|
||||
|
||||
|
||||
#[cfg(target_pointer_width = "64")]
|
||||
@@ -4383,24 +4366,20 @@ mod ptr_try_from_impls {
|
||||
@@ -4444,24 +4422,20 @@ mod ptr_try_from_impls {
|
||||
use convert::TryFrom;
|
||||
|
||||
|
||||
try_from_upper_bounded!(usize, u8, u16, u32);
|
||||
- try_from_unbounded!(usize, u64, u128);
|
||||
+ try_from_unbounded!(usize, u64);
|
||||
try_from_upper_bounded!(usize, i8, i16, i32, i64);
|
||||
- try_from_unbounded!(usize, i128);
|
||||
|
||||
|
||||
try_from_both_bounded!(isize, u8, u16, u32);
|
||||
- try_from_lower_bounded!(isize, u64, u128);
|
||||
+ try_from_lower_bounded!(isize, u64);
|
||||
try_from_both_bounded!(isize, i8, i16, i32);
|
||||
- try_from_unbounded!(isize, i64, i128);
|
||||
+ try_from_unbounded!(isize, i64);
|
||||
|
||||
|
||||
rev!(try_from_unbounded, usize, u32, u64);
|
||||
- rev!(try_from_upper_bounded, usize, u128);
|
||||
rev!(try_from_lower_bounded, usize, i8, i16, i32, i64);
|
||||
- rev!(try_from_both_bounded, usize, i128);
|
||||
|
||||
|
||||
rev!(try_from_unbounded, isize, u16, u32);
|
||||
- rev!(try_from_upper_bounded, isize, u64, u128);
|
||||
+ rev!(try_from_upper_bounded, isize, u64);
|
||||
rev!(try_from_unbounded, isize, i32, i64);
|
||||
- rev!(try_from_both_bounded, isize, i128);
|
||||
}
|
||||
|
||||
|
||||
#[doc(hidden)]
|
||||
@@ -4435,7 +4414,7 @@ macro_rules! doit {
|
||||
@@ -4496,7 +4470,7 @@ macro_rules! doit {
|
||||
}
|
||||
})*)
|
||||
}
|
||||
-doit! { i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize }
|
||||
+doit! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
|
||||
|
||||
|
||||
fn from_str_radix<T: FromStrRadixHelper>(src: &str, radix: u32) -> Result<T, ParseIntError> {
|
||||
use self::IntErrorKind::*;
|
||||
@@ -4603,52 +4582,38 @@ impl_from_bool! { u8, #[stable(feature = "from_bool", since = "1.28.0")] }
|
||||
@@ -4664,52 +4638,38 @@ impl_from_bool! { u8, #[stable(feature = "from_bool", since = "1.28.0")] }
|
||||
impl_from_bool! { u16, #[stable(feature = "from_bool", since = "1.28.0")] }
|
||||
impl_from_bool! { u32, #[stable(feature = "from_bool", since = "1.28.0")] }
|
||||
impl_from_bool! { u64, #[stable(feature = "from_bool", since = "1.28.0")] }
|
||||
|
@ -484,7 +462,7 @@ index 0b8f8f0703..584d24130e 100644
|
|||
impl_from_bool! { i64, #[stable(feature = "from_bool", since = "1.28.0")] }
|
||||
-impl_from_bool! { i128, #[stable(feature = "from_bool", since = "1.28.0")] }
|
||||
impl_from_bool! { isize, #[stable(feature = "from_bool", since = "1.28.0")] }
|
||||
|
||||
|
||||
// Unsigned -> Unsigned
|
||||
impl_from! { u8, u16, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
impl_from! { u8, u32, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
|
@ -497,7 +475,7 @@ index 0b8f8f0703..584d24130e 100644
|
|||
impl_from! { u32, u64, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
-impl_from! { u32, u128, #[stable(feature = "i128", since = "1.26.0")] }
|
||||
-impl_from! { u64, u128, #[stable(feature = "i128", since = "1.26.0")] }
|
||||
|
||||
|
||||
// Signed -> Signed
|
||||
impl_from! { i8, i16, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
impl_from! { i8, i32, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
|
@ -510,7 +488,7 @@ index 0b8f8f0703..584d24130e 100644
|
|||
impl_from! { i32, i64, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
-impl_from! { i32, i128, #[stable(feature = "i128", since = "1.26.0")] }
|
||||
-impl_from! { i64, i128, #[stable(feature = "i128", since = "1.26.0")] }
|
||||
|
||||
|
||||
// Unsigned -> Signed
|
||||
impl_from! { u8, i16, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
impl_from! { u8, i32, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
|
@ -522,33 +500,11 @@ index 0b8f8f0703..584d24130e 100644
|
|||
impl_from! { u32, i64, #[stable(feature = "lossless_int_conv", since = "1.5.0")] }
|
||||
-impl_from! { u32, i128, #[stable(feature = "i128", since = "1.26.0")] }
|
||||
-impl_from! { u64, i128, #[stable(feature = "i128", since = "1.26.0")] }
|
||||
|
||||
|
||||
// The C99 standard defines bounds on INTPTR_MIN, INTPTR_MAX, and UINTPTR_MAX
|
||||
// which imply that pointer-sized integers must be at least 16 bits:
|
||||
diff --git a/src/libcore/num/u128.rs b/src/libcore/num/u128.rs
|
||||
deleted file mode 100644
|
||||
index e8c783a1bb..0000000000
|
||||
--- a/src/libcore/num/u128.rs
|
||||
+++ /dev/null
|
||||
@@ -1,16 +0,0 @@
|
||||
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
-// file at the top-level directory of this distribution and at
|
||||
-// http://rust-lang.org/COPYRIGHT.
|
||||
-//
|
||||
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
-// option. This file may not be copied, modified, or distributed
|
||||
-// except according to those terms.
|
||||
-
|
||||
-//! The 128-bit unsigned integer type.
|
||||
-//!
|
||||
-//! *[See also the `u128` primitive type](../../std/primitive.u128.html).*
|
||||
-
|
||||
-#![stable(feature = "i128", since = "1.26.0")]
|
||||
-uint_module! { u128, #[stable(feature = "i128", since="1.26.0")] }
|
||||
diff --git a/src/libcore/num/wrapping.rs b/src/libcore/num/wrapping.rs
|
||||
index 1c826c2fa7..0779e31572 100644
|
||||
index 1c826c2..0779e31 100644
|
||||
--- a/src/libcore/num/wrapping.rs
|
||||
+++ b/src/libcore/num/wrapping.rs
|
||||
@@ -112,19 +112,17 @@ macro_rules! sh_impl_all {
|
||||
|
@ -557,7 +513,7 @@ index 1c826c2fa7..0779e31572 100644
|
|||
//sh_impl_unsigned! { $t, u64 }
|
||||
- //sh_impl_unsigned! { $t, u128 }
|
||||
sh_impl_unsigned! { $t, usize }
|
||||
|
||||
|
||||
//sh_impl_signed! { $t, i8 }
|
||||
//sh_impl_signed! { $t, i16 }
|
||||
//sh_impl_signed! { $t, i32 }
|
||||
|
@ -566,46 +522,46 @@ index 1c826c2fa7..0779e31572 100644
|
|||
//sh_impl_signed! { $t, isize }
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-sh_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize }
|
||||
+sh_impl_all! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }
|
||||
|
||||
|
||||
// FIXME(30524): impl Op<T> for Wrapping<T>, impl OpAssign<T> for Wrapping<T>
|
||||
macro_rules! wrapping_impl {
|
||||
@@ -323,7 +321,7 @@ macro_rules! wrapping_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-wrapping_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+wrapping_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
macro_rules! wrapping_int_impl {
|
||||
($($t:ty)*) => ($(
|
||||
@@ -685,7 +683,7 @@ assert_eq!(Wrapping(3i8).pow(6), Wrapping(-39));
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-wrapping_int_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+wrapping_int_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
macro_rules! wrapping_int_impl_signed {
|
||||
($($t:ty)*) => ($(
|
||||
@@ -814,7 +812,7 @@ assert!(!Wrapping(10", stringify!($t), ").is_negative());
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-wrapping_int_impl_signed! { isize i8 i16 i32 i64 i128 }
|
||||
+wrapping_int_impl_signed! { isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
macro_rules! wrapping_int_impl_unsigned {
|
||||
($($t:ty)*) => ($(
|
||||
@@ -891,7 +889,7 @@ assert_eq!(Wrapping(200_u8).next_power_of_two(), Wrapping(0));
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-wrapping_int_impl_unsigned! { usize u8 u16 u32 u64 u128 }
|
||||
+wrapping_int_impl_unsigned! { usize u8 u16 u32 u64 }
|
||||
|
||||
|
||||
mod shift_max {
|
||||
#![allow(non_upper_case_globals)]
|
||||
@@ -918,13 +916,11 @@ mod shift_max {
|
||||
|
@ -614,7 +570,7 @@ index 1c826c2fa7..0779e31572 100644
|
|||
pub const i64: u32 = (1 << 6) - 1;
|
||||
- pub const i128: u32 = (1 << 7) - 1;
|
||||
pub use self::platform::isize;
|
||||
|
||||
|
||||
pub const u8: u32 = i8;
|
||||
pub const u16: u32 = i16;
|
||||
pub const u32: u32 = i32;
|
||||
|
@ -623,143 +579,143 @@ index 1c826c2fa7..0779e31572 100644
|
|||
pub use self::platform::usize;
|
||||
}
|
||||
diff --git a/src/libcore/ops/arith.rs b/src/libcore/ops/arith.rs
|
||||
index a1bc5463f7..38742be1ce 100644
|
||||
index a1bc546..38742be 100644
|
||||
--- a/src/libcore/ops/arith.rs
|
||||
+++ b/src/libcore/ops/arith.rs
|
||||
@@ -114,7 +114,7 @@ macro_rules! add_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-add_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+add_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
|
||||
|
||||
|
||||
/// The subtraction operator `-`.
|
||||
///
|
||||
@@ -212,7 +212,7 @@ macro_rules! sub_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-sub_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+sub_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
|
||||
|
||||
|
||||
/// The multiplication operator `*`.
|
||||
///
|
||||
@@ -332,7 +332,7 @@ macro_rules! mul_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-mul_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+mul_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
|
||||
|
||||
|
||||
/// The division operator `/`.
|
||||
///
|
||||
@@ -457,7 +457,7 @@ macro_rules! div_impl_integer {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-div_impl_integer! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+div_impl_integer! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
macro_rules! div_impl_float {
|
||||
($($t:ty)*) => ($(
|
||||
@@ -542,7 +542,7 @@ macro_rules! rem_impl_integer {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-rem_impl_integer! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+rem_impl_integer! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
|
||||
|
||||
macro_rules! rem_impl_float {
|
||||
@@ -641,7 +641,7 @@ macro_rules! neg_impl_unsigned {
|
||||
}
|
||||
|
||||
|
||||
// neg_impl_unsigned! { usize u8 u16 u32 u64 }
|
||||
-neg_impl_numeric! { isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+neg_impl_numeric! { isize i8 i16 i32 i64 f32 f64 }
|
||||
|
||||
|
||||
/// The addition assignment operator `+=`.
|
||||
///
|
||||
@@ -697,7 +697,7 @@ macro_rules! add_assign_impl {
|
||||
)+)
|
||||
}
|
||||
|
||||
|
||||
-add_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+add_assign_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
|
||||
|
||||
|
||||
/// The subtraction assignment operator `-=`.
|
||||
///
|
||||
@@ -753,7 +753,7 @@ macro_rules! sub_assign_impl {
|
||||
)+)
|
||||
}
|
||||
|
||||
|
||||
-sub_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+sub_assign_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
|
||||
|
||||
|
||||
/// The multiplication assignment operator `*=`.
|
||||
///
|
||||
@@ -800,7 +800,7 @@ macro_rules! mul_assign_impl {
|
||||
)+)
|
||||
}
|
||||
|
||||
|
||||
-mul_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+mul_assign_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
|
||||
|
||||
|
||||
/// The division assignment operator `/=`.
|
||||
///
|
||||
@@ -846,7 +846,7 @@ macro_rules! div_assign_impl {
|
||||
)+)
|
||||
}
|
||||
|
||||
|
||||
-div_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+div_assign_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
|
||||
|
||||
|
||||
/// The remainder assignment operator `%=`.
|
||||
///
|
||||
@@ -896,4 +896,4 @@ macro_rules! rem_assign_impl {
|
||||
)+)
|
||||
}
|
||||
|
||||
|
||||
-rem_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
|
||||
+rem_assign_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
|
||||
diff --git a/src/libcore/ops/bit.rs b/src/libcore/ops/bit.rs
|
||||
index 3900f365b0..66b7980a43 100644
|
||||
index 3900f36..66b7980 100644
|
||||
--- a/src/libcore/ops/bit.rs
|
||||
+++ b/src/libcore/ops/bit.rs
|
||||
@@ -65,7 +65,7 @@ macro_rules! not_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-not_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+not_impl! { bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
/// The bitwise AND operator `&`.
|
||||
///
|
||||
@@ -149,7 +149,7 @@ macro_rules! bitand_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-bitand_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+bitand_impl! { bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
/// The bitwise OR operator `|`.
|
||||
///
|
||||
@@ -233,7 +233,7 @@ macro_rules! bitor_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-bitor_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+bitor_impl! { bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
/// The bitwise XOR operator `^`.
|
||||
///
|
||||
@@ -320,7 +320,7 @@ macro_rules! bitxor_impl {
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-bitxor_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+bitxor_impl! { bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
/// The left shift operator `<<`. Note that because this trait is implemented
|
||||
/// for all integer types with multiple right-hand-side types, Rust's type
|
||||
@@ -417,19 +417,17 @@ macro_rules! shl_impl_all {
|
||||
|
@ -768,7 +724,7 @@ index 3900f365b0..66b7980a43 100644
|
|||
shl_impl! { $t, u64 }
|
||||
- shl_impl! { $t, u128 }
|
||||
shl_impl! { $t, usize }
|
||||
|
||||
|
||||
shl_impl! { $t, i8 }
|
||||
shl_impl! { $t, i16 }
|
||||
shl_impl! { $t, i32 }
|
||||
|
@ -777,10 +733,10 @@ index 3900f365b0..66b7980a43 100644
|
|||
shl_impl! { $t, isize }
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-shl_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 isize i128 }
|
||||
+shl_impl_all! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }
|
||||
|
||||
|
||||
/// The right shift operator `>>`. Note that because this trait is implemented
|
||||
/// for all integer types with multiple right-hand-side types, Rust's type
|
||||
@@ -526,19 +524,17 @@ macro_rules! shr_impl_all {
|
||||
|
@ -789,7 +745,7 @@ index 3900f365b0..66b7980a43 100644
|
|||
shr_impl! { $t, u64 }
|
||||
- shr_impl! { $t, u128 }
|
||||
shr_impl! { $t, usize }
|
||||
|
||||
|
||||
shr_impl! { $t, i8 }
|
||||
shr_impl! { $t, i16 }
|
||||
shr_impl! { $t, i32 }
|
||||
|
@ -798,37 +754,37 @@ index 3900f365b0..66b7980a43 100644
|
|||
shr_impl! { $t, isize }
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-shr_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize }
|
||||
+shr_impl_all! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }
|
||||
|
||||
|
||||
/// The bitwise AND assignment operator `&=`.
|
||||
///
|
||||
@@ -626,7 +622,7 @@ macro_rules! bitand_assign_impl {
|
||||
)+)
|
||||
}
|
||||
|
||||
|
||||
-bitand_assign_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+bitand_assign_impl! { bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
/// The bitwise OR assignment operator `|=`.
|
||||
///
|
||||
@@ -675,7 +671,7 @@ macro_rules! bitor_assign_impl {
|
||||
)+)
|
||||
}
|
||||
|
||||
|
||||
-bitor_assign_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+bitor_assign_impl! { bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
/// The bitwise XOR assignment operator `^=`.
|
||||
///
|
||||
@@ -724,7 +720,7 @@ macro_rules! bitxor_assign_impl {
|
||||
)+)
|
||||
}
|
||||
|
||||
|
||||
-bitxor_assign_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
|
||||
+bitxor_assign_impl! { bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
|
||||
|
||||
|
||||
/// The left shift assignment operator `<<=`.
|
||||
///
|
||||
@@ -780,19 +776,17 @@ macro_rules! shl_assign_impl_all {
|
||||
|
@ -837,7 +793,7 @@ index 3900f365b0..66b7980a43 100644
|
|||
shl_assign_impl! { $t, u64 }
|
||||
- shl_assign_impl! { $t, u128 }
|
||||
shl_assign_impl! { $t, usize }
|
||||
|
||||
|
||||
shl_assign_impl! { $t, i8 }
|
||||
shl_assign_impl! { $t, i16 }
|
||||
shl_assign_impl! { $t, i32 }
|
||||
|
@ -846,10 +802,10 @@ index 3900f365b0..66b7980a43 100644
|
|||
shl_assign_impl! { $t, isize }
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-shl_assign_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize }
|
||||
+shl_assign_impl_all! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }
|
||||
|
||||
|
||||
/// The right shift assignment operator `>>=`.
|
||||
///
|
||||
@@ -848,16 +842,14 @@ macro_rules! shr_assign_impl_all {
|
||||
|
@ -858,7 +814,7 @@ index 3900f365b0..66b7980a43 100644
|
|||
shr_assign_impl! { $t, u64 }
|
||||
- shr_assign_impl! { $t, u128 }
|
||||
shr_assign_impl! { $t, usize }
|
||||
|
||||
|
||||
shr_assign_impl! { $t, i8 }
|
||||
shr_assign_impl! { $t, i16 }
|
||||
shr_assign_impl! { $t, i32 }
|
||||
|
@ -867,11 +823,11 @@ index 3900f365b0..66b7980a43 100644
|
|||
shr_assign_impl! { $t, isize }
|
||||
)*)
|
||||
}
|
||||
|
||||
|
||||
-shr_assign_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize }
|
||||
+shr_assign_impl_all! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }
|
||||
diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs
|
||||
index 72b115f8b5..d542e10bb0 100644
|
||||
index 72b115f..d542e10 100644
|
||||
--- a/src/libcore/tests/iter.rs
|
||||
+++ b/src/libcore/tests/iter.rs
|
||||
@@ -224,8 +224,6 @@ fn test_iterator_step_by_nth_overflow() {
|
||||
|
@ -880,12 +836,12 @@ index 72b115f8b5..d542e10bb0 100644
|
|||
type Bigger = u64;
|
||||
- #[cfg(target_pointer_width = "64")]
|
||||
- type Bigger = u128;
|
||||
|
||||
|
||||
#[derive(Clone)]
|
||||
struct Test(Bigger);
|
||||
@@ -1878,19 +1876,6 @@ fn test_step_replace_signed() {
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
-fn test_step_replace_no_between() {
|
||||
- let mut x = 4u128;
|
||||
|
@ -904,7 +860,7 @@ index 72b115f8b5..d542e10bb0 100644
|
|||
let f = &|acc, x| i32::checked_add(2*acc, x);
|
||||
assert_eq!((1..10).rev().try_fold(7, f), (1..10).try_rfold(7, f));
|
||||
diff --git a/src/libcore/tests/num/mod.rs b/src/libcore/tests/num/mod.rs
|
||||
index ab96d3126b..bb5c1d06da 100644
|
||||
index ab96d31..bb5c1d0 100644
|
||||
--- a/src/libcore/tests/num/mod.rs
|
||||
+++ b/src/libcore/tests/num/mod.rs
|
||||
@@ -196,12 +196,10 @@ test_impl_from! { test_boolu8, bool, u8 }
|
||||
|
@ -917,7 +873,7 @@ index ab96d3126b..bb5c1d06da 100644
|
|||
test_impl_from! { test_booli32, bool, i32 }
|
||||
test_impl_from! { test_booli64, bool, i64 }
|
||||
-test_impl_from! { test_booli128, bool, i128 }
|
||||
|
||||
|
||||
// Signed -> Float
|
||||
test_impl_from! { test_i8f32, i8, f32 }
|
||||
@@ -283,51 +281,35 @@ test_impl_try_from_always_ok! { test_try_u8u8, u8, u8 }
|
||||
|
@ -929,7 +885,7 @@ index ab96d3126b..bb5c1d06da 100644
|
|||
test_impl_try_from_always_ok! { test_try_u8i32, u8, i32 }
|
||||
test_impl_try_from_always_ok! { test_try_u8i64, u8, i64 }
|
||||
-test_impl_try_from_always_ok! { test_try_u8i128, u8, i128 }
|
||||
|
||||
|
||||
test_impl_try_from_always_ok! { test_try_u16u16, u16, u16 }
|
||||
test_impl_try_from_always_ok! { test_try_u16u32, u16, u32 }
|
||||
test_impl_try_from_always_ok! { test_try_u16u64, u16, u64 }
|
||||
|
@ -937,49 +893,49 @@ index ab96d3126b..bb5c1d06da 100644
|
|||
test_impl_try_from_always_ok! { test_try_u16i32, u16, i32 }
|
||||
test_impl_try_from_always_ok! { test_try_u16i64, u16, i64 }
|
||||
-test_impl_try_from_always_ok! { test_try_u16i128, u16, i128 }
|
||||
|
||||
|
||||
test_impl_try_from_always_ok! { test_try_u32u32, u32, u32 }
|
||||
test_impl_try_from_always_ok! { test_try_u32u64, u32, u64 }
|
||||
-test_impl_try_from_always_ok! { test_try_u32u128, u32, u128 }
|
||||
test_impl_try_from_always_ok! { test_try_u32i64, u32, i64 }
|
||||
-test_impl_try_from_always_ok! { test_try_u32i128, u32, i128 }
|
||||
|
||||
|
||||
test_impl_try_from_always_ok! { test_try_u64u64, u64, u64 }
|
||||
-test_impl_try_from_always_ok! { test_try_u64u128, u64, u128 }
|
||||
-test_impl_try_from_always_ok! { test_try_u64i128, u64, i128 }
|
||||
-
|
||||
-test_impl_try_from_always_ok! { test_try_u128u128, u128, u128 }
|
||||
|
||||
|
||||
test_impl_try_from_always_ok! { test_try_i8i8, i8, i8 }
|
||||
test_impl_try_from_always_ok! { test_try_i8i16, i8, i16 }
|
||||
test_impl_try_from_always_ok! { test_try_i8i32, i8, i32 }
|
||||
test_impl_try_from_always_ok! { test_try_i8i64, i8, i64 }
|
||||
-test_impl_try_from_always_ok! { test_try_i8i128, i8, i128 }
|
||||
|
||||
|
||||
test_impl_try_from_always_ok! { test_try_i16i16, i16, i16 }
|
||||
test_impl_try_from_always_ok! { test_try_i16i32, i16, i32 }
|
||||
test_impl_try_from_always_ok! { test_try_i16i64, i16, i64 }
|
||||
-test_impl_try_from_always_ok! { test_try_i16i128, i16, i128 }
|
||||
|
||||
|
||||
test_impl_try_from_always_ok! { test_try_i32i32, i32, i32 }
|
||||
test_impl_try_from_always_ok! { test_try_i32i64, i32, i64 }
|
||||
-test_impl_try_from_always_ok! { test_try_i32i128, i32, i128 }
|
||||
|
||||
|
||||
test_impl_try_from_always_ok! { test_try_i64i64, i64, i64 }
|
||||
-test_impl_try_from_always_ok! { test_try_i64i128, i64, i128 }
|
||||
-
|
||||
-test_impl_try_from_always_ok! { test_try_i128i128, i128, i128 }
|
||||
|
||||
|
||||
test_impl_try_from_always_ok! { test_try_usizeusize, usize, usize }
|
||||
test_impl_try_from_always_ok! { test_try_isizeisize, isize, isize }
|
||||
diff --git a/src/libcore/time.rs b/src/libcore/time.rs
|
||||
index 54973b7b77..1c07753e01 100644
|
||||
index b589202..0f8a2ee 100644
|
||||
--- a/src/libcore/time.rs
|
||||
+++ b/src/libcore/time.rs
|
||||
@@ -268,57 +268,6 @@ impl Duration {
|
||||
#[inline]
|
||||
pub const fn subsec_nanos(&self) -> u32 { self.nanos }
|
||||
|
||||
|
||||
- /// Returns the total number of whole milliseconds contained by this `Duration`.
|
||||
- ///
|
||||
- /// # Examples
|
||||
|
@ -1034,6 +990,6 @@ index 54973b7b77..1c07753e01 100644
|
|||
/// Checked `Duration` addition. Computes `self + other`, returning [`None`]
|
||||
/// if overflow occurred.
|
||||
///
|
||||
--
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
|
30
Cargo.lock
generated
30
Cargo.lock
generated
|
@ -90,38 +90,48 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cranelift"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
dependencies = [
|
||||
"cranelift-codegen 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"cranelift-frontend 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-bforest"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
dependencies = [
|
||||
"cranelift-entity 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-codegen"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
dependencies = [
|
||||
"cranelift-bforest 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"cranelift-codegen-meta 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"cranelift-entity 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"failure_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"target-lexicon 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-codegen-meta"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-entity"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-faerie"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
dependencies = [
|
||||
"cranelift-codegen 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"cranelift-module 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
|
@ -134,7 +144,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cranelift-frontend"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
dependencies = [
|
||||
"cranelift-codegen 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
]
|
||||
|
@ -142,17 +152,18 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cranelift-module"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
dependencies = [
|
||||
"cranelift-codegen 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"cranelift-entity 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-native"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
dependencies = [
|
||||
"cranelift-codegen 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"raw-cpuid 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
@ -162,7 +173,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cranelift-simplejit"
|
||||
version = "0.18.1"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#3e01b4f35f02f757dab3d42fbf62b21fef88895f"
|
||||
source = "git+https://github.com/CraneStation/cranelift.git#78b7d344d24705888c865defb755c5c0ae2b516e"
|
||||
dependencies = [
|
||||
"cranelift-codegen 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
"cranelift-module 0.18.1 (git+https://github.com/CraneStation/cranelift.git)",
|
||||
|
@ -653,6 +664,7 @@ dependencies = [
|
|||
"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
|
||||
"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
|
||||
"checksum cranelift 0.18.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
|
||||
"checksum cranelift-bforest 0.18.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
|
||||
"checksum cranelift-codegen 0.18.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
|
||||
"checksum cranelift-codegen-meta 0.18.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
|
||||
"checksum cranelift-entity 0.18.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue