Skip to content

Commit 18348b1

Browse files
committed
Rustup to rustc 1.47.0-nightly (663d2f5cd 2020-08-22)
1 parent ec37225 commit 18348b1

5 files changed

+18
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ index 1a6be3a..42dbd59 100644
9898
+*/
9999

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

patches/0023-core-Ignore-failing-tests.patch

+13
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,19 @@ index 4bc44e9..8e3c7a4 100644
3030

3131
#[test]
3232
fn empty_array_is_always_default() {
33+
@@ -304,6 +304,7 @@ fn array_map() {
34+
assert_eq!(b, [1, 2, 3]);
35+
}
36+
37+
+/*
38+
// See note on above test for why `should_panic` is used.
39+
#[test]
40+
#[should_panic(expected = "test succeeded")]
41+
@@ -332,3 +333,4 @@ fn array_map_drop_safety() {
42+
assert_eq!(DROPPED.load(Ordering::SeqCst), num_to_create);
43+
panic!("test succeeded")
44+
}
45+
+*/
3346
diff --git a/library/core/tests/num/mod.rs b/library/core/tests/num/mod.rs
3447
index a17c094..5bb11d2 100644
3548
--- a/library/core/tests/num/mod.rs

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-08-09
1+
nightly-2020-08-23

src/base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,7 @@ fn trans_stmt<'tcx>(
760760
_ => fx.tcx.sess.span_fatal(stmt.source_info.span, "Inline assembly is not supported"),
761761
}
762762
}
763+
StatementKind::Coverage { .. } => fx.tcx.sess.fatal("-Zcoverage is unimplemented"),
763764
}
764765
}
765766

src/constant.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -364,15 +364,15 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut Module<impl Backend>, cx: &mu
364364
data_ctx.set_segment_section("", &*section_name);
365365
}
366366

367-
let bytes = alloc.inspect_with_undef_and_ptr_outside_interpreter(0..alloc.len()).to_vec();
367+
let bytes = alloc.inspect_with_uninit_and_ptr_outside_interpreter(0..alloc.len()).to_vec();
368368
data_ctx.define(bytes.into_boxed_slice());
369369

370370
for &(offset, (_tag, reloc)) in alloc.relocations().iter() {
371371
let addend = {
372372
let endianness = tcx.data_layout.endian;
373373
let offset = offset.bytes() as usize;
374374
let ptr_size = tcx.data_layout.pointer_size;
375-
let bytes = &alloc.inspect_with_undef_and_ptr_outside_interpreter(offset..offset + ptr_size.bytes() as usize);
375+
let bytes = &alloc.inspect_with_uninit_and_ptr_outside_interpreter(offset..offset + ptr_size.bytes() as usize);
376376
read_target_uint(endianness, bytes).unwrap()
377377
};
378378

0 commit comments

Comments
 (0)