From dfd7a6d5aae8e03a0149eb5134f4b5dd763036d5 Mon Sep 17 00:00:00 2001 From: hyd-dev Date: Tue, 15 Jun 2021 16:11:49 +0800 Subject: [PATCH] Rustup --- rust-version | 2 +- tests/compile-fail/validity/invalid_enum_tag.rs | 2 +- .../validity/invalid_enum_tag_256variants_uninit.rs | 2 +- tests/compile-fail/validity/transmute_through_ptr.rs | 2 +- tests/run-pass/stacked-borrows/interior_mutability.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rust-version b/rust-version index 7d2e8afafac..18cfda63a53 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -a50d72158e08e02cfc051b863017bdbd2c45b637 +d74b36ea2f814b720c39d7b60aecaefe512a056b diff --git a/tests/compile-fail/validity/invalid_enum_tag.rs b/tests/compile-fail/validity/invalid_enum_tag.rs index 39e8eed683a..d4ee3cc8a34 100644 --- a/tests/compile-fail/validity/invalid_enum_tag.rs +++ b/tests/compile-fail/validity/invalid_enum_tag.rs @@ -4,5 +4,5 @@ pub enum Foo { } fn main() { - let _f = unsafe { std::mem::transmute::(42) }; //~ ERROR encountered 0x0000002a at ., but expected a valid enum tag + let _f = unsafe { std::mem::transmute::(42) }; //~ ERROR type validation failed at .: encountered 0x0000002a, but expected a valid enum tag } diff --git a/tests/compile-fail/validity/invalid_enum_tag_256variants_uninit.rs b/tests/compile-fail/validity/invalid_enum_tag_256variants_uninit.rs index 74e24491e61..ccf97b416c6 100644 --- a/tests/compile-fail/validity/invalid_enum_tag_256variants_uninit.rs +++ b/tests/compile-fail/validity/invalid_enum_tag_256variants_uninit.rs @@ -266,5 +266,5 @@ union MyUninit { } fn main() { - let _a = unsafe { MyUninit { init: () }.uninit }; //~ ERROR encountered uninitialized bytes at ., but expected a valid enum tag + let _a = unsafe { MyUninit { init: () }.uninit }; //~ ERROR type validation failed at .: encountered uninitialized bytes, but expected a valid enum tag } diff --git a/tests/compile-fail/validity/transmute_through_ptr.rs b/tests/compile-fail/validity/transmute_through_ptr.rs index 0ef69efb86e..cd354eac4ae 100644 --- a/tests/compile-fail/validity/transmute_through_ptr.rs +++ b/tests/compile-fail/validity/transmute_through_ptr.rs @@ -11,6 +11,6 @@ fn main() { let mut x = Bool::True; evil(&mut x); let y = x; // reading this ought to be enough to trigger validation - //~^ ERROR encountered 0x0000002c at ., but expected a valid enum tag + //~^ ERROR type validation failed at .: encountered 0x0000002c, but expected a valid enum tag println!("{:?}", y); // make sure it is used (and not optimized away) } diff --git a/tests/run-pass/stacked-borrows/interior_mutability.rs b/tests/run-pass/stacked-borrows/interior_mutability.rs index 17e628a09f2..87624e520db 100644 --- a/tests/run-pass/stacked-borrows/interior_mutability.rs +++ b/tests/run-pass/stacked-borrows/interior_mutability.rs @@ -1,4 +1,4 @@ -#![feature(maybe_uninit_extra, maybe_uninit_ref)] +#![feature(maybe_uninit_extra)] use std::mem::MaybeUninit; use std::cell::{Cell, RefCell, UnsafeCell};