Skip to content

Commit 94effb9

Browse files
committed
Rustup to rustc 1.38.0-nightly (e3cebcb3b 2019-07-19)
1 parent 2c9139d commit 94effb9

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

build_sysroot/Cargo.toml

+4
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ compiler_builtins = { path = "./compiler_builtins" }
1818

1919
[profile.release]
2020
debug = true
21+
22+
[profile.dev]
23+
# FIXME correctly align constants, so that copy_nonoverlapping doesn't complain about alignment
24+
debug-assertions = false

patches/0001-Disable-stdsimd.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ index f2165c6..cdb42c1 100644
1818

1919
+/*
2020
// Pull in the `core_arch` crate directly into libcore. The contents of
21-
// `core_arch` are in a different repository: rust-lang-nursery/stdsimd.
21+
// `core_arch` are in a different repository: rust-lang/stdarch.
2222
//
2323
@@ -235,3 +236,4 @@ mod core_arch;
2424

@@ -53,7 +53,7 @@ index 6dd3a6c..c7401e2 100644
5353

5454
+/*
5555
// Pull in the `std_detect` crate directly into libstd. The contents of
56-
// `std_detect` are in a different repository: rust-lang-nursery/stdsimd.
56+
// `std_detect` are in a different repository: rust-lang/stdarch.
5757
//
5858
@@ -505,6 +502,7 @@ mod std_detect;
5959
#[unstable(feature = "stdsimd", issue = "48556")]

src/unsize.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ pub fn unsized_info<'a, 'tcx: 'a>(
1414
target: Ty<'tcx>,
1515
old_info: Option<Value>,
1616
) -> Value {
17-
let (source, target) = fx.tcx.struct_lockstep_tails(source, target);
17+
let (source, target) =
18+
fx.tcx.struct_lockstep_tails_erasing_lifetimes(source, target, ParamEnv::reveal_all());
1819
match (&source.sty, &target.sty) {
1920
(&ty::Array(_, len), &ty::Slice(_)) => fx
2021
.bcx

0 commit comments

Comments
 (0)