about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlbin Hedman <albin9604@gmail.com>2020-12-07 21:26:09 +0100
committerAlbin Hedman <albin9604@gmail.com>2020-12-07 21:26:09 +0100
commit69ab0bcabff34b97cd8fe9f0c741748a9ffc8928 (patch)
tree040196dada7bb76d8b0cf1c0acfe12107eea7cb3
parentbdda98aaba493be28569083c5ac57629caf3504d (diff)
downloadrust-69ab0bcabff34b97cd8fe9f0c741748a9ffc8928.tar.gz
rust-69ab0bcabff34b97cd8fe9f0c741748a9ffc8928.zip
Use 'error-pattern' in ui test
-rw-r--r--src/test/ui/assume-type-intrinsics.rs4
-rw-r--r--src/test/ui/assume-type-intrinsics.stderr19
2 files changed, 6 insertions, 17 deletions
diff --git a/src/test/ui/assume-type-intrinsics.rs b/src/test/ui/assume-type-intrinsics.rs
index 8e9cb334527..77370e1ccc5 100644
--- a/src/test/ui/assume-type-intrinsics.rs
+++ b/src/test/ui/assume-type-intrinsics.rs
@@ -1,11 +1,13 @@
+// error-pattern: any use of this value will cause an error
+
 #![feature(never_type)]
 #![feature(const_maybe_uninit_assume_init)]
 
+#[allow(invalid_value)]
 fn main() {
     use std::mem::MaybeUninit;
 
     const _BAD: () = unsafe {
         MaybeUninit::<!>::uninit().assume_init();
-        //~^ WARN: the type `!` does not permit being left uninitialized
     };
 }
diff --git a/src/test/ui/assume-type-intrinsics.stderr b/src/test/ui/assume-type-intrinsics.stderr
index b776915affd..6f400086a54 100644
--- a/src/test/ui/assume-type-intrinsics.stderr
+++ b/src/test/ui/assume-type-intrinsics.stderr
@@ -6,29 +6,16 @@ LL |               intrinsics::assert_inhabited::<T>();
    |               |
    |               attempted to instantiate uninhabited type `!`
    |               inside `MaybeUninit::<!>::assume_init` at $SRC_DIR/core/src/mem/maybe_uninit.rs:LL:COL
-   |               inside `_BAD` at $DIR/assume-type-intrinsics.rs:8:9
+   |               inside `_BAD` at $DIR/assume-type-intrinsics.rs:11:9
    | 
-  ::: $DIR/assume-type-intrinsics.rs:7:5
+  ::: $DIR/assume-type-intrinsics.rs:10:5
    |
 LL | /     const _BAD: () = unsafe {
 LL | |         MaybeUninit::<!>::uninit().assume_init();
-LL | |
 LL | |     };
    | |______-
    |
    = note: `#[deny(const_err)]` on by default
 
-warning: the type `!` does not permit being left uninitialized
-  --> $DIR/assume-type-intrinsics.rs:8:9
-   |
-LL |         MaybeUninit::<!>::uninit().assume_init();
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |         |
-   |         this code causes undefined behavior when executed
-   |         help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
-   |
-   = note: `#[warn(invalid_value)]` on by default
-   = note: the `!` type has no valid value
-
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to previous error