Skip to content

Commit e1613a6

Browse files
committed
Rustup to rustc 1.41.0-nightly (a605441e0 2019-12-15)
1 parent 88277f9 commit e1613a6

4 files changed

+31
-30
lines changed

patches/0003-Disable-inline-assembly-in-libcore.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ index ad5a207..04712b8 100644
1616
#[unstable(feature = "renamed_spin_loop", issue = "55002")]
1717
pub fn spin_loop() {
1818
+ /*
19-
#[cfg(
20-
all(
21-
any(target_arch = "x86", target_arch = "x86_64"),
19+
#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "sse2"))]
20+
{
21+
#[cfg(target_arch = "x86")]
2222
@@ -71,4 +72,5 @@ pub fn spin_loop() {
2323
unsafe { crate::arch::arm::__yield() };
2424
}

patches/0022-core-Disable-not-compiling-tests.patch

+25-25
Original file line numberDiff line numberDiff line change
@@ -44,41 +44,41 @@ index 0475aeb..9558198 100644
4444
--- a/src/libcore/tests/num/int_macros.rs
4545
+++ b/src/libcore/tests/num/int_macros.rs
4646
@@ -88,6 +88,7 @@ mod tests {
47-
assert_eq!(C.count_zeros(), bits as u32 - 5);
48-
}
47+
assert_eq!(C.count_zeros(), bits as u32 - 5);
48+
}
4949

50-
+ /*
51-
#[test]
52-
fn test_rotate() {
53-
assert_eq!(A.rotate_left(6).rotate_right(2).rotate_right(4), A);
50+
+ /*
51+
#[test]
52+
fn test_rotate() {
53+
assert_eq!(A.rotate_left(6).rotate_right(2).rotate_right(4), A);
5454
@@ -112,6 +113,7 @@ mod tests {
55-
assert_eq!(B.rotate_left(64), B);
56-
assert_eq!(C.rotate_left(64), C);
57-
}
58-
+ */
55+
assert_eq!(B.rotate_left(64), B);
56+
assert_eq!(C.rotate_left(64), C);
57+
}
58+
+ */
5959

60-
#[test]
61-
fn test_swap_bytes() {
60+
#[test]
61+
fn test_swap_bytes() {
6262
diff --git a/src/libcore/tests/num/uint_macros.rs b/src/libcore/tests/num/uint_macros.rs
6363
index 04ed14f..a6e372e 100644
6464
--- a/src/libcore/tests/num/uint_macros.rs
6565
+++ b/src/libcore/tests/num/uint_macros.rs
6666
@@ -52,6 +52,7 @@ mod tests {
67-
assert!(C.count_zeros() == bits as u32 - 5);
68-
}
67+
assert!(C.count_zeros() == bits as u32 - 5);
68+
}
6969

70-
+ /*
71-
#[test]
72-
fn test_rotate() {
73-
assert_eq!(A.rotate_left(6).rotate_right(2).rotate_right(4), A);
70+
+ /*
71+
#[test]
72+
fn test_rotate() {
73+
assert_eq!(A.rotate_left(6).rotate_right(2).rotate_right(4), A);
7474
@@ -76,6 +77,7 @@ mod tests {
75-
assert_eq!(B.rotate_left(64), B);
76-
assert_eq!(C.rotate_left(64), C);
77-
}
78-
+ */
75+
assert_eq!(B.rotate_left(64), B);
76+
assert_eq!(C.rotate_left(64), C);
77+
}
78+
+ */
7979

80-
#[test]
81-
fn test_swap_bytes() {
80+
#[test]
81+
fn test_swap_bytes() {
8282
diff --git a/src/libcore/tests/ptr.rs b/src/libcore/tests/ptr.rs
8383
index 1a6be3a..42dbd59 100644
8484
--- a/src/libcore/tests/ptr.rs
@@ -98,7 +98,7 @@ index 1a6be3a..42dbd59 100644
9898
+*/
9999

100100
#[test]
101-
#[cfg(not(miri))] // Miri does not compute a maximal `mid` for `align_offset`
101+
#[cfg_attr(miri, ignore)] // Miri does not compute a maximal `mid` for `align_offset`
102102
diff --git a/src/libcore/tests/slice.rs b/src/libcore/tests/slice.rs
103103
index 6609bc3..241b497 100644
104104
--- a/src/libcore/tests/slice.rs

src/base.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ pub fn trans_place<'tcx>(
647647
};
648648
cplace = cplace.place_index(fx, index);
649649
}
650-
PlaceElem::Subslice { from, to } => {
650+
PlaceElem::Subslice { from, to, from_end } => {
651651
// These indices are generated by slice patterns.
652652
// slice[from:-to] in Python terms.
653653

@@ -665,6 +665,7 @@ pub fn trans_place<'tcx>(
665665
);
666666
}
667667
ty::Slice(elem_ty) => {
668+
assert!(from_end, "slice subslices should be `from_end`");
668669
let elem_layout = fx.layout_of(elem_ty);
669670
let (ptr, len) = cplace.to_addr_maybe_unsized(fx);
670671
let len = len.unwrap();

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(rustc_private, decl_macro, type_alias_impl_trait, associated_type_bounds)]
1+
#![feature(rustc_private, decl_macro, type_alias_impl_trait, associated_type_bounds, never_type)]
22
#![allow(intra_doc_link_resolution_failure)]
33

44
extern crate flate2;

0 commit comments

Comments
 (0)