Skip to content

Commit dfd7a6d

Browse files
author
hyd-dev
committed
Rustup
1 parent d39f0c6 commit dfd7a6d

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a50d72158e08e02cfc051b863017bdbd2c45b637
1+
d74b36ea2f814b720c39d7b60aecaefe512a056b

tests/compile-fail/validity/invalid_enum_tag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ pub enum Foo {
44
}
55

66
fn main() {
7-
let _f = unsafe { std::mem::transmute::<i32, Foo>(42) }; //~ ERROR encountered 0x0000002a at .<enum-tag>, but expected a valid enum tag
7+
let _f = unsafe { std::mem::transmute::<i32, Foo>(42) }; //~ ERROR type validation failed at .<enum-tag>: encountered 0x0000002a, but expected a valid enum tag
88
}

tests/compile-fail/validity/invalid_enum_tag_256variants_uninit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,5 +266,5 @@ union MyUninit {
266266
}
267267

268268
fn main() {
269-
let _a = unsafe { MyUninit { init: () }.uninit }; //~ ERROR encountered uninitialized bytes at .<enum-tag>, but expected a valid enum tag
269+
let _a = unsafe { MyUninit { init: () }.uninit }; //~ ERROR type validation failed at .<enum-tag>: encountered uninitialized bytes, but expected a valid enum tag
270270
}

tests/compile-fail/validity/transmute_through_ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ fn main() {
1111
let mut x = Bool::True;
1212
evil(&mut x);
1313
let y = x; // reading this ought to be enough to trigger validation
14-
//~^ ERROR encountered 0x0000002c at .<enum-tag>, but expected a valid enum tag
14+
//~^ ERROR type validation failed at .<enum-tag>: encountered 0x0000002c, but expected a valid enum tag
1515
println!("{:?}", y); // make sure it is used (and not optimized away)
1616
}

tests/run-pass/stacked-borrows/interior_mutability.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(maybe_uninit_extra, maybe_uninit_ref)]
1+
#![feature(maybe_uninit_extra)]
22
use std::mem::MaybeUninit;
33
use std::cell::{Cell, RefCell, UnsafeCell};
44

0 commit comments

Comments
 (0)