about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlbin Hedman <albin9604@gmail.com>2020-12-05 18:39:10 +0100
committerAlbin Hedman <albin9604@gmail.com>2020-12-05 18:39:10 +0100
commit7bd754cf8ca8e4b673f5432c837150b53c8d713d (patch)
tree35ff6b3a1b66cf667dc6a1861d9428556edf380a
parentd366ed2730ed4a11df8a18f440c6874f7fa610f2 (diff)
downloadrust-7bd754cf8ca8e4b673f5432c837150b53c8d713d.tar.gz
rust-7bd754cf8ca8e4b673f5432c837150b53c8d713d.zip
Fix tests (hopefully)
-rw-r--r--compiler/rustc_mir/src/const_eval/error.rs2
-rw-r--r--library/core/tests/mem.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_mir/src/const_eval/error.rs b/compiler/rustc_mir/src/const_eval/error.rs
index 345a3d7e79b..0e610e37552 100644
--- a/compiler/rustc_mir/src/const_eval/error.rs
+++ b/compiler/rustc_mir/src/const_eval/error.rs
@@ -47,7 +47,7 @@ impl fmt::Display for ConstEvalErrKind {
             Panic { msg, line, col, file } => {
                 write!(f, "the evaluated program panicked at '{}', {}:{}:{}", msg, file, line, col)
             }
-            Abort(ref msg) => write!(f, "{}", msg)
+            Abort(ref msg) => write!(f, "{}", msg),
         }
     }
 }
diff --git a/library/core/tests/mem.rs b/library/core/tests/mem.rs
index 7822c69d10b..f2e441de30b 100644
--- a/library/core/tests/mem.rs
+++ b/library/core/tests/mem.rs
@@ -132,7 +132,7 @@ fn test_discriminant_send_sync() {
 
 #[test]
 fn assume_init_good() {
-    const TRUE: bool = {
+    const TRUE: bool = unsafe {
         let mut x = MaybeUninit::<bool>::uninit();
         x.as_mut_ptr().write(true);
         x.assume_init()
@@ -143,7 +143,7 @@ fn assume_init_good() {
 #[test]
 #[should_panic]
 fn assume_init_bad() {
-    const BAD: () = {
+    const BAD: () = unsafe {
         MaybeUninit::<!>::uninit().assume_init();
     };
 }