diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-09-29 13:50:06 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-09-29 13:56:30 +0200 |
| commit | 684c054e3180cee629bdbe465cb6d83af0964689 (patch) | |
| tree | d98ab2a74a2fce1620ef163106eedd0f56fdeb01 | |
| parent | a9ec4de6f2f63b9d18e6c2b1eaa8fb9571cffb58 (diff) | |
| download | rust-684c054e3180cee629bdbe465cb6d83af0964689.tar.gz rust-684c054e3180cee629bdbe465cb6d83af0964689.zip | |
Rustup to rustc 1.48.0-nightly (fc2daaae6 2020-09-28)
| -rw-r--r-- | patches/0023-core-Ignore-failing-tests.patch | 5 | ||||
| -rw-r--r-- | rust-toolchain | 2 | ||||
| -rw-r--r-- | scripts/config.sh | 2 | ||||
| -rw-r--r-- | src/constant.rs | 7 | ||||
| -rw-r--r-- | src/target_features_whitelist.rs | 1 |
5 files changed, 6 insertions, 11 deletions
diff --git a/patches/0023-core-Ignore-failing-tests.patch b/patches/0023-core-Ignore-failing-tests.patch index ff8cece212c..5d2c3049f60 100644 --- a/patches/0023-core-Ignore-failing-tests.patch +++ b/patches/0023-core-Ignore-failing-tests.patch @@ -38,11 +38,14 @@ index 4bc44e9..8e3c7a4 100644 // See note on above test for why `should_panic` is used. #[test] #[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); 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 index a17c094..5bb11d2 100644 --- a/library/core/tests/num/mod.rs diff --git a/rust-toolchain b/rust-toolchain index 753ad9df5dd..f0c20eb8efc 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-09-20 +nightly-2020-09-29 diff --git a/scripts/config.sh b/scripts/config.sh index b6479e4f696..aaa2323abe3 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -40,8 +40,6 @@ if [[ `uname` == 'Darwin' ]]; then export RUSTFLAGS="$RUSTFLAGS -Clink-arg=-undefined -Clink-arg=dynamic_lookup" 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 DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH diff --git a/src/constant.rs b/src/constant.rs index c01256b7f74..2c4d9b8f177 100644 --- a/src/constant.rs +++ b/src/constant.rs @@ -390,12 +390,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut Module<impl Backend>, cx: &mu .link_section .map(|s| s.as_str()); - let const_ = tcx.const_eval_poly(def_id).unwrap(); - - let alloc = match const_ { - ConstValue::ByRef { alloc, offset } if offset.bytes() == 0 => alloc, - _ => bug!("static const eval returned {:#?}", const_), - }; + let alloc = tcx.eval_static_initializer(def_id).unwrap(); let data_id = data_id_for_static(tcx, module, def_id, true); (data_id, alloc, section_name) diff --git a/src/target_features_whitelist.rs b/src/target_features_whitelist.rs index 527522fca70..2710cb4aff7 100644 --- a/src/target_features_whitelist.rs +++ b/src/target_features_whitelist.rs @@ -73,7 +73,6 @@ const X86_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[ ("fma", None), ("fxsr", None), ("lzcnt", None), - ("mmx", Some(sym::mmx_target_feature)), ("movbe", Some(sym::movbe_target_feature)), ("pclmulqdq", None), ("popcnt", None), |