From d5ea294114014f080e11b23abdc09c7d645547ad Mon Sep 17 00:00:00 2001 From: LeSeulArtichaut Date: Sun, 14 Mar 2021 22:25:42 +0100 Subject: Test `-Zthir-unsafeck` for unused unsafe blocks --- src/test/ui/issues/issue-48131.mir.stderr | 20 ++++++++++++++++++++ src/test/ui/issues/issue-48131.rs | 3 +++ src/test/ui/issues/issue-48131.stderr | 20 -------------------- src/test/ui/issues/issue-48131.thir.stderr | 20 ++++++++++++++++++++ ...nsafe-around-compiler-generated-unsafe.mir.stderr | 14 ++++++++++++++ .../unsafe-around-compiler-generated-unsafe.rs | 3 +++ .../unsafe-around-compiler-generated-unsafe.stderr | 14 -------------- ...safe-around-compiler-generated-unsafe.thir.stderr | 14 ++++++++++++++ 8 files changed, 74 insertions(+), 34 deletions(-) create mode 100644 src/test/ui/issues/issue-48131.mir.stderr delete mode 100644 src/test/ui/issues/issue-48131.stderr create mode 100644 src/test/ui/issues/issue-48131.thir.stderr create mode 100644 src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.mir.stderr delete mode 100644 src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr create mode 100644 src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.thir.stderr (limited to 'src/test') diff --git a/src/test/ui/issues/issue-48131.mir.stderr b/src/test/ui/issues/issue-48131.mir.stderr new file mode 100644 index 00000000000..6817e8830c5 --- /dev/null +++ b/src/test/ui/issues/issue-48131.mir.stderr @@ -0,0 +1,20 @@ +error: unnecessary `unsafe` block + --> $DIR/issue-48131.rs:12:9 + | +LL | unsafe { /* unnecessary */ } + | ^^^^^^ unnecessary `unsafe` block + | +note: the lint level is defined here + --> $DIR/issue-48131.rs:6:9 + | +LL | #![deny(unused_unsafe)] + | ^^^^^^^^^^^^^ + +error: unnecessary `unsafe` block + --> $DIR/issue-48131.rs:23:13 + | +LL | unsafe { /* unnecessary */ } + | ^^^^^^ unnecessary `unsafe` block + +error: aborting due to 2 previous errors + diff --git a/src/test/ui/issues/issue-48131.rs b/src/test/ui/issues/issue-48131.rs index 85664e62ead..df98547084d 100644 --- a/src/test/ui/issues/issue-48131.rs +++ b/src/test/ui/issues/issue-48131.rs @@ -1,3 +1,6 @@ +// revisions: mir thir +// [thir]compile-flags: -Z thir-unsafeck + // This note is annotated because the purpose of the test // is to ensure that certain other notes are not generated. #![deny(unused_unsafe)] //~ NOTE diff --git a/src/test/ui/issues/issue-48131.stderr b/src/test/ui/issues/issue-48131.stderr deleted file mode 100644 index 5acc4f16e9f..00000000000 --- a/src/test/ui/issues/issue-48131.stderr +++ /dev/null @@ -1,20 +0,0 @@ -error: unnecessary `unsafe` block - --> $DIR/issue-48131.rs:9:9 - | -LL | unsafe { /* unnecessary */ } - | ^^^^^^ unnecessary `unsafe` block - | -note: the lint level is defined here - --> $DIR/issue-48131.rs:3:9 - | -LL | #![deny(unused_unsafe)] - | ^^^^^^^^^^^^^ - -error: unnecessary `unsafe` block - --> $DIR/issue-48131.rs:20:13 - | -LL | unsafe { /* unnecessary */ } - | ^^^^^^ unnecessary `unsafe` block - -error: aborting due to 2 previous errors - diff --git a/src/test/ui/issues/issue-48131.thir.stderr b/src/test/ui/issues/issue-48131.thir.stderr new file mode 100644 index 00000000000..6817e8830c5 --- /dev/null +++ b/src/test/ui/issues/issue-48131.thir.stderr @@ -0,0 +1,20 @@ +error: unnecessary `unsafe` block + --> $DIR/issue-48131.rs:12:9 + | +LL | unsafe { /* unnecessary */ } + | ^^^^^^ unnecessary `unsafe` block + | +note: the lint level is defined here + --> $DIR/issue-48131.rs:6:9 + | +LL | #![deny(unused_unsafe)] + | ^^^^^^^^^^^^^ + +error: unnecessary `unsafe` block + --> $DIR/issue-48131.rs:23:13 + | +LL | unsafe { /* unnecessary */ } + | ^^^^^^ unnecessary `unsafe` block + +error: aborting due to 2 previous errors + diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.mir.stderr b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.mir.stderr new file mode 100644 index 00000000000..68101326861 --- /dev/null +++ b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.mir.stderr @@ -0,0 +1,14 @@ +error: unnecessary `unsafe` block + --> $DIR/unsafe-around-compiler-generated-unsafe.rs:9:5 + | +LL | unsafe { println!("foo"); } + | ^^^^^^ unnecessary `unsafe` block + | +note: the lint level is defined here + --> $DIR/unsafe-around-compiler-generated-unsafe.rs:6:9 + | +LL | #![deny(unused_unsafe)] + | ^^^^^^^^^^^^^ + +error: aborting due to previous error + diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs index 817939e0757..08801f9ef59 100644 --- a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs +++ b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs @@ -1,5 +1,8 @@ // issue #12418 +// revisions: mir thir +// [thir]compile-flags: -Z thir-unsafeck + #![deny(unused_unsafe)] fn main() { diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr deleted file mode 100644 index 0dba8496efd..00000000000 --- a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr +++ /dev/null @@ -1,14 +0,0 @@ -error: unnecessary `unsafe` block - --> $DIR/unsafe-around-compiler-generated-unsafe.rs:6:5 - | -LL | unsafe { println!("foo"); } - | ^^^^^^ unnecessary `unsafe` block - | -note: the lint level is defined here - --> $DIR/unsafe-around-compiler-generated-unsafe.rs:3:9 - | -LL | #![deny(unused_unsafe)] - | ^^^^^^^^^^^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.thir.stderr b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.thir.stderr new file mode 100644 index 00000000000..68101326861 --- /dev/null +++ b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.thir.stderr @@ -0,0 +1,14 @@ +error: unnecessary `unsafe` block + --> $DIR/unsafe-around-compiler-generated-unsafe.rs:9:5 + | +LL | unsafe { println!("foo"); } + | ^^^^^^ unnecessary `unsafe` block + | +note: the lint level is defined here + --> $DIR/unsafe-around-compiler-generated-unsafe.rs:6:9 + | +LL | #![deny(unused_unsafe)] + | ^^^^^^^^^^^^^ + +error: aborting due to previous error + -- cgit 1.4.1-3-g733a5