mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-09 05:23:07 +00:00
Rustup to rustc 1.48.0-nightly (fc2daaae6
2020-09-28)
This commit is contained in:
parent
a9ec4de6f2
commit
684c054e31
@ -38,11 +38,14 @@ index 4bc44e9..8e3c7a4 100644
|
|||||||
// See note on above test for why `should_panic` is used.
|
// See note on above test for why `should_panic` is used.
|
||||||
#[test]
|
#[test]
|
||||||
#[should_panic(expected = "test succeeded")]
|
#[should_panic(expected = "test succeeded")]
|
||||||
@@ -332,3 +333,4 @@ fn array_map_drop_safety() {
|
@@ -332,6 +333,7 @@ fn array_map_drop_safety() {
|
||||||
assert_eq!(DROPPED.load(Ordering::SeqCst), num_to_create);
|
assert_eq!(DROPPED.load(Ordering::SeqCst), num_to_create);
|
||||||
panic!("test succeeded")
|
panic!("test succeeded")
|
||||||
}
|
}
|
||||||
+*/
|
+*/
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn cell_allows_array_cycle() {
|
||||||
diff --git a/library/core/tests/num/mod.rs b/library/core/tests/num/mod.rs
|
diff --git a/library/core/tests/num/mod.rs b/library/core/tests/num/mod.rs
|
||||||
index a17c094..5bb11d2 100644
|
index a17c094..5bb11d2 100644
|
||||||
--- a/library/core/tests/num/mod.rs
|
--- a/library/core/tests/num/mod.rs
|
||||||
|
@ -1 +1 @@
|
|||||||
nightly-2020-09-20
|
nightly-2020-09-29
|
||||||
|
@ -40,8 +40,6 @@ if [[ `uname` == 'Darwin' ]]; then
|
|||||||
export RUSTFLAGS="$RUSTFLAGS -Clink-arg=-undefined -Clink-arg=dynamic_lookup"
|
export RUSTFLAGS="$RUSTFLAGS -Clink-arg=-undefined -Clink-arg=dynamic_lookup"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export RUSTC_LOG=warn # display metadata load errors
|
|
||||||
|
|
||||||
export LD_LIBRARY_PATH="$(pwd)/target/out:$(pwd)/build_sysroot/sysroot/lib/rustlib/$TARGET_TRIPLE/lib"
|
export LD_LIBRARY_PATH="$(pwd)/target/out:$(pwd)/build_sysroot/sysroot/lib/rustlib/$TARGET_TRIPLE/lib"
|
||||||
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
|
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
|
||||||
|
|
||||||
|
@ -390,12 +390,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut Module<impl Backend>, cx: &mu
|
|||||||
.link_section
|
.link_section
|
||||||
.map(|s| s.as_str());
|
.map(|s| s.as_str());
|
||||||
|
|
||||||
let const_ = tcx.const_eval_poly(def_id).unwrap();
|
let alloc = tcx.eval_static_initializer(def_id).unwrap();
|
||||||
|
|
||||||
let alloc = match const_ {
|
|
||||||
ConstValue::ByRef { alloc, offset } if offset.bytes() == 0 => alloc,
|
|
||||||
_ => bug!("static const eval returned {:#?}", const_),
|
|
||||||
};
|
|
||||||
|
|
||||||
let data_id = data_id_for_static(tcx, module, def_id, true);
|
let data_id = data_id_for_static(tcx, module, def_id, true);
|
||||||
(data_id, alloc, section_name)
|
(data_id, alloc, section_name)
|
||||||
|
@ -73,7 +73,6 @@ const X86_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
|
|||||||
("fma", None),
|
("fma", None),
|
||||||
("fxsr", None),
|
("fxsr", None),
|
||||||
("lzcnt", None),
|
("lzcnt", None),
|
||||||
("mmx", Some(sym::mmx_target_feature)),
|
|
||||||
("movbe", Some(sym::movbe_target_feature)),
|
("movbe", Some(sym::movbe_target_feature)),
|
||||||
("pclmulqdq", None),
|
("pclmulqdq", None),
|
||||||
("popcnt", None),
|
("popcnt", None),
|
||||||
|
Loading…
Reference in New Issue
Block a user