OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rustup to rustc 1.33.0-nightly (bf669d1e3 2019-01-25)

Browse Source
This commit is contained in:
bjorn3 2019-01-26 11:59:34 +01:00
parent c728530bd0
commit 9e609db886
2 changed files with 180 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
patches/0002-Disable-u128-and-i128-in-libcore.patch
View File

@ -1,6 +1,6 @@
From 84040eb5ffeecaeb13863ff6d4106d6e4e2daaa9 Mon Sep 17 00:00:00 2001
From 76c92b0dcd7919dab3a48d707d615f260390b839 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Fri, 28 Dec 2018 10:31:59 +0100
Date: Sat, 26 Jan 2019 11:50:08 +0100
Subject: [PATCH] Disable u128 and i128 in libcore
---
@ -14,7 +14,7 @@ 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/mod.rs | 99 ++++++++--------------------
src/libcore/num/mod.rs | 100 ++++++++--------------------
src/libcore/num/wrapping.rs | 14 ++--
src/libcore/ops/arith.rs | 22 +++----
src/libcore/ops/bit.rs | 30 ++++-----
@ -22,17 +22,17 @@ Subject: [PATCH] Disable u128 and i128 in libcore
src/libcore/tests/iter.rs | 15 -----
src/libcore/tests/num/mod.rs | 18 -----
src/libcore/time.rs | 123 -----------------------------------
src/libstd/lib.rs | 5 --
src/libstd/lib.rs | 4 --
src/libstd/net/ip.rs | 20 ------
src/libstd/num.rs | 2 +-
src/libstd/panic.rs | 6 --
22 files changed, 63 insertions(+), 368 deletions(-)
diff --git a/src/libcore/clone.rs b/src/libcore/clone.rs
index 74b3ce4..9617ed1 100644
index ed90b7d..1739f91 100644
--- a/src/libcore/clone.rs
+++ b/src/libcore/clone.rs
@@ -162,8 +162,8 @@ mod impls {
@@ -173,8 +173,8 @@ mod impls {
}
impl_clone! {
@ -44,10 +44,10 @@ index 74b3ce4..9617ed1 100644
bool char
}
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs
index 9336b13..8faa03f 100644
index d43a5c1..268e5f1 100644
--- a/src/libcore/cmp.rs
+++ b/src/libcore/cmp.rs
@@ -873,7 +873,7 @@ mod impls {
@@ -876,7 +876,7 @@ mod impls {
}
partial_eq_impl! {
@ -56,7 +56,7 @@ index 9336b13..8faa03f 100644
}
macro_rules! eq_impl {
@@ -883,7 +883,7 @@ mod impls {
@@ -886,7 +886,7 @@ mod impls {
)*)
}
@ -65,7 +65,7 @@ index 9336b13..8faa03f 100644
macro_rules! partial_ord_impl {
($($t:ty)*) => ($(
@@ -972,7 +972,7 @@ mod impls {
@@ -975,7 +975,7 @@ mod impls {
}
}
@ -218,10 +218,10 @@ index e8c6cd8..f58b446 100644
/// An iterator adapter that produces output as long as the underlying
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 252d7da..3c13282 100644
index 74a7115..634df60 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -145,14 +145,12 @@ mod uint_macros;
@@ -149,14 +149,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;
@ -237,7 +237,7 @@ index 252d7da..3c13282 100644
#[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 53af924..243a4f3 100644
index 65752ba..d3b797a 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -663,8 +663,8 @@ mod copy_impls {
@ -252,7 +252,7 @@ index 53af924..243a4f3 100644
bool char
}
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
index c024868..e512596 100644
index 8fcbb73..0e20b88 100644
--- a/src/libcore/mem.rs
+++ b/src/libcore/mem.rs
@@ -163,12 +163,10 @@ pub fn forget_unsized<T: ?Sized>(t: T) {
@ -269,18 +269,24 @@ index c024868..e512596 100644
/// f64 | 8
/// char | 4
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index e776513..6018aea 100644
index 423b800..b2b3f90 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -102,7 +102,6 @@ nonzero_integers! {
NonZeroU16(u16);
NonZeroU32(u32);
NonZeroU64(u64);
- NonZeroU128(u128);
NonZeroUsize(usize);
@@ -102,13 +102,11 @@ nonzero_integers! {
#[stable(feature = "nonzero", since = "1.28.0")] NonZeroU16(u16);
#[stable(feature = "nonzero", since = "1.28.0")] NonZeroU32(u32);
#[stable(feature = "nonzero", since = "1.28.0")] NonZeroU64(u64);
- #[stable(feature = "nonzero", since = "1.28.0")] NonZeroU128(u128);
#[stable(feature = "nonzero", since = "1.28.0")] NonZeroUsize(usize);
#[stable(feature = "signed_nonzero", since = "1.34.0")] NonZeroI8(i8);
#[stable(feature = "signed_nonzero", since = "1.34.0")] NonZeroI16(i16);
#[stable(feature = "signed_nonzero", since = "1.34.0")] NonZeroI32(i32);
#[stable(feature = "signed_nonzero", since = "1.34.0")] NonZeroI64(i64);
- #[stable(feature = "signed_nonzero", since = "1.34.0")] NonZeroI128(i128);
#[stable(feature = "signed_nonzero", since = "1.34.0")] NonZeroIsize(isize);
}
@@ -2110,18 +2109,6 @@ impl i64 {
@@ -2125,18 +2123,6 @@ impl i64 {
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]" }
}
@ -299,7 +305,7 @@ index e776513..6018aea 100644
#[cfg(target_pointer_width = "16")]
#[lang = "isize"]
impl isize {
@@ -4393,17 +4380,6 @@ impl u64 {
@@ -4440,17 +4426,6 @@ impl u64 {
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]" }
}
@ -317,7 +323,7 @@ index e776513..6018aea 100644
#[cfg(target_pointer_width = "16")]
#[lang = "usize"]
impl usize {
@@ -4487,7 +4463,7 @@ macro_rules! from_str_radix_int_impl {
@@ -4534,7 +4509,7 @@ macro_rules! from_str_radix_int_impl {
}
)*}
}
@ -326,7 +332,7 @@ index e776513..6018aea 100644
/// The error type returned when a checked integral type conversion fails.
#[unstable(feature = "try_from", issue = "33417")]
@@ -4603,30 +4579,25 @@ macro_rules! rev {
@@ -4650,30 +4625,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);
@ -361,7 +367,7 @@ index e776513..6018aea 100644
// usize/isize
try_from_upper_bounded!(usize, isize);
@@ -4638,21 +4609,21 @@ mod ptr_try_from_impls {
@@ -4685,21 +4655,21 @@ mod ptr_try_from_impls {
use convert::TryFrom;
try_from_upper_bounded!(usize, u8);
@ -391,7 +397,7 @@ index e776513..6018aea 100644
}
#[cfg(target_pointer_width = "32")]
@@ -4661,24 +4632,24 @@ mod ptr_try_from_impls {
@@ -4708,24 +4678,24 @@ mod ptr_try_from_impls {
use convert::TryFrom;
try_from_upper_bounded!(usize, u8, u16);
@ -424,7 +430,7 @@ index e776513..6018aea 100644
}
#[cfg(target_pointer_width = "64")]
@@ -4687,24 +4658,20 @@ mod ptr_try_from_impls {
@@ -4734,24 +4704,20 @@ mod ptr_try_from_impls {
use convert::TryFrom;
try_from_upper_bounded!(usize, u8, u16, u32);
@ -453,7 +459,7 @@ index e776513..6018aea 100644
}
#[doc(hidden)]
@@ -4739,7 +4706,7 @@ macro_rules! doit {
@@ -4786,7 +4752,7 @@ macro_rules! doit {
}
})*)
}
@ -462,7 +468,7 @@ index e776513..6018aea 100644
fn from_str_radix<T: FromStrRadixHelper>(src: &str, radix: u32) -> Result<T, ParseIntError> {
use self::IntErrorKind::*;
@@ -4930,52 +4897,38 @@ impl_from_bool! { u8, #[stable(feature = "from_bool", since = "1.28.0")] }
@@ -4977,52 +4943,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")] }
@ -839,10 +845,10 @@ index 2c9bf24..af2ab6f 100644
-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/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 99e6365..d863e33 100644
index 8992e51..c1babcd 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -1943,34 +1943,6 @@ atomic_int! {
@@ -1937,34 +1937,6 @@ atomic_int! {
8,
u64 AtomicU64 ATOMIC_U64_INIT
}
@ -878,10 +884,10 @@ index 99e6365..d863e33 100644
macro_rules! ptr_width {
() => { 2 }
diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs
index cf19851..6b4a72b 100644
index 0fa9974..75b44b1 100644
--- a/src/libcore/tests/iter.rs
+++ b/src/libcore/tests/iter.rs
@@ -214,8 +214,6 @@ fn test_iterator_step_by_nth_overflow() {
@@ -215,8 +215,6 @@ fn test_iterator_step_by_nth_overflow() {
type Bigger = u32;
#[cfg(target_pointer_width = "32")]
type Bigger = u64;
@ -890,7 +896,7 @@ index cf19851..6b4a72b 100644
#[derive(Clone)]
struct Test(Bigger);
@@ -1950,19 +1948,6 @@ fn test_step_replace_signed() {
@@ -1968,19 +1966,6 @@ fn test_step_replace_signed() {
assert_eq!(y, 5);
}
@ -980,7 +986,7 @@ index a17c094..3c36d10 100644
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 b12ee04..fe0faad 100644
index a751965..5d162cb 100644
--- a/src/libcore/time.rs
+++ b/src/libcore/time.rs
@@ -21,7 +21,6 @@ const NANOS_PER_MILLI: u32 = 1_000_000;
@ -991,7 +997,7 @@ index b12ee04..fe0faad 100644
/// The duration of one second.
#[unstable(feature = "duration_constants", issue = "57391")]
@@ -260,54 +259,6 @@ impl Duration {
@@ -276,54 +275,6 @@ impl Duration {
#[inline]
pub const fn subsec_nanos(&self) -> u32 { self.nanos }
@ -1046,7 +1052,7 @@ index b12ee04..fe0faad 100644
/// Checked `Duration` addition. Computes `self + other`, returning [`None`]
/// if overflow occurred.
///
@@ -466,80 +417,6 @@ impl Duration {
@@ -482,80 +433,6 @@ impl Duration {
(self.secs as f64) + (self.nanos as f64) / (NANOS_PER_SEC as f64)
}
@ -1128,10 +1134,10 @@ index b12ee04..fe0faad 100644
///
/// # Examples
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 3051100..61001a4 100644
index f395813..d81f80b 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -404,8 +403,6 @@ pub use core::i16;
@@ -401,8 +401,6 @@ pub use core::i16;
pub use core::i32;
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::i64;
@ -1140,7 +1146,7 @@ index 3051100..61001a4 100644
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::usize;
#[stable(feature = "rust1", since = "1.0.0")]
@@ -438,8 +435,6 @@ pub use alloc_crate::string;
@@ -435,8 +433,6 @@ pub use alloc_crate::string;
pub use alloc_crate::vec;
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::char;
@ -1150,7 +1156,7 @@ index 3051100..61001a4 100644
pub use core::hint;
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs
index 52a29f4..cafe50e 100644
index f98113e..6c41e4e 100644
--- a/src/libstd/net/ip.rs
+++ b/src/libstd/net/ip.rs
@@ -1382,26 +1382,6 @@ impl FromInner<c::in6_addr> for Ipv6Addr {
@ -1219,3 +1225,4 @@ index d27f6ca..8ac2a44 100644
#[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
--
2.17.2 (Apple Git-113)

6
src/main_shim.rs
View File

@ -9,9 +9,9 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx: 'a>(
use rustc::middle::lang_items::StartFnLangItem;
use rustc::session::config::EntryFnType;
let (main_def_id, use_start_lang_item) = match *tcx.sess.entry_fn.borrow() {
Some((id, _, entry_ty)) => (
tcx.hir().local_def_id(id),
let (main_def_id, use_start_lang_item) = match tcx.entry_fn(LOCAL_CRATE) {
Some((def_id, entry_ty)) => (
def_id,
match entry_ty {
EntryFnType::Main => true,
EntryFnType::Start => false,