Skip to content

Commit cae90b6

Browse files
committed
rustup and test fixes
1 parent bec7aab commit cae90b6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13f9aa190957b993a268fd4a046fce76ca8814ee
1+
efc02b03d18b0cbaa55b1e421d792f70a39230b2

tests/compile-fail/concurrency/thread_local_static_dealloc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ static mut TLS: u8 = 0;
99

1010
fn main() { unsafe {
1111
let dangling_ptr = std::thread::spawn(|| &TLS as *const u8 as usize).join().unwrap();
12-
let _val = *(dangling_ptr as *const u8);
12+
let _val = *(dangling_ptr as *const u8); //~ ERROR dereferenced after this allocation got freed
1313
} }

tests/run-pass/panic/catch_panic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// normalize-stderr-test "[^ ]*libcore/[a-z/]+.rs[0-9:]*" -> "$$LOC"
1+
// normalize-stderr-test "[^ ]*libcore/[a-z_/]+.rs[0-9:]*" -> "$$LOC"
22
#![feature(never_type)]
33
#![allow(unconditional_panic)]
44

0 commit comments

Comments
 (0)