Skip to content

Commit 684c054

Browse files
committed
Rustup to rustc 1.48.0-nightly (fc2daaae6 2020-09-28)
1 parent a9ec4de commit 684c054

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,14 @@ index 4bc44e9..8e3c7a4 100644
3838
// See note on above test for why `should_panic` is used.
3939
#[test]
4040
#[should_panic(expected = "test succeeded")]
41-
@@ -332,3 +333,4 @@ fn array_map_drop_safety() {
41+
@@ -332,6 +333,7 @@ fn array_map_drop_safety() {
4242
assert_eq!(DROPPED.load(Ordering::SeqCst), num_to_create);
4343
panic!("test succeeded")
4444
}
4545
+*/
46+
47+
#[test]
48+
fn cell_allows_array_cycle() {
4649
diff --git a/library/core/tests/num/mod.rs b/library/core/tests/num/mod.rs
4750
index a17c094..5bb11d2 100644
4851
--- a/library/core/tests/num/mod.rs

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-09-20
1+
nightly-2020-09-29

scripts/config.sh

-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ if [[ `uname` == 'Darwin' ]]; then
4040
export RUSTFLAGS="$RUSTFLAGS -Clink-arg=-undefined -Clink-arg=dynamic_lookup"
4141
fi
4242

43-
export RUSTC_LOG=warn # display metadata load errors
44-
4543
export LD_LIBRARY_PATH="$(pwd)/target/out:$(pwd)/build_sysroot/sysroot/lib/rustlib/$TARGET_TRIPLE/lib"
4644
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
4745

src/constant.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -390,12 +390,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut Module<impl Backend>, cx: &mu
390390
.link_section
391391
.map(|s| s.as_str());
392392

393-
let const_ = tcx.const_eval_poly(def_id).unwrap();
394-
395-
let alloc = match const_ {
396-
ConstValue::ByRef { alloc, offset } if offset.bytes() == 0 => alloc,
397-
_ => bug!("static const eval returned {:#?}", const_),
398-
};
393+
let alloc = tcx.eval_static_initializer(def_id).unwrap();
399394

400395
let data_id = data_id_for_static(tcx, module, def_id, true);
401396
(data_id, alloc, section_name)

src/target_features_whitelist.rs

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ const X86_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
7373
("fma", None),
7474
("fxsr", None),
7575
("lzcnt", None),
76-
("mmx", Some(sym::mmx_target_feature)),
7776
("movbe", Some(sym::movbe_target_feature)),
7877
("pclmulqdq", None),
7978
("popcnt", None),

0 commit comments

Comments
 (0)