5 files changed, 6 insertions, 37 deletions
diff --git a/tests/ui/lint/lint-owned-heap-memory.rs b/tests/ui/lint/lint-owned-heap-memory.rs
deleted file mode 100644
index af47d5c0720..00000000000
--- a/tests/ui/lint/lint-owned-heap-memory.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#![allow(dead_code)]
-#![forbid(box_pointers)]
-
-
-struct Foo {
-    x: Box<isize> //~ ERROR type uses owned
-}
-
-fn main() {
-    let _x: Foo = Foo { x : Box::new(10) };
-    //~^ ERROR type uses owned
-}
diff --git a/tests/ui/lint/lint-owned-heap-memory.stderr b/tests/ui/lint/lint-owned-heap-memory.stderr
deleted file mode 100644
index 5ba39697075..00000000000
--- a/tests/ui/lint/lint-owned-heap-memory.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error: type uses owned (Box type) pointers: Box<isize>
-  --> $DIR/lint-owned-heap-memory.rs:6:5
-   |
-LL |     x: Box<isize>
-   |     ^^^^^^^^^^^^^
-   |
-note: the lint level is defined here
-  --> $DIR/lint-owned-heap-memory.rs:2:11
-   |
-LL | #![forbid(box_pointers)]
-   |           ^^^^^^^^^^^^
-
-error: type uses owned (Box type) pointers: Box<isize>
-  --> $DIR/lint-owned-heap-memory.rs:10:29
-   |
-LL |     let _x: Foo = Foo { x : Box::new(10) };
-   |                             ^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/lint/reasons-erroneous.rs b/tests/ui/lint/reasons-erroneous.rs
index 244b376b60d..0aa46953bf1 100644
--- a/tests/ui/lint/reasons-erroneous.rs
+++ b/tests/ui/lint/reasons-erroneous.rs
@@ -9,7 +9,7 @@
 #![warn(bare_trait_objects, reasons = "leaders to no sure land, guides their bearings lost")]
 //~^ ERROR malformed lint attribute
 //~| NOTE bad attribute argument
-#![warn(box_pointers, blerp = "or in league with robbers have reversed the signposts")]
+#![warn(unsafe_code, blerp = "or in league with robbers have reversed the signposts")]
 //~^ ERROR malformed lint attribute
 //~| NOTE bad attribute argument
 #![warn(elided_lifetimes_in_paths, reason("disrespectful to ancestors", "irresponsible to heirs"))]
diff --git a/tests/ui/lint/reasons-erroneous.stderr b/tests/ui/lint/reasons-erroneous.stderr
index adc97174b99..fcff88d8e0f 100644
--- a/tests/ui/lint/reasons-erroneous.stderr
+++ b/tests/ui/lint/reasons-erroneous.stderr
@@ -17,10 +17,10 @@ LL | #![warn(bare_trait_objects, reasons = "leaders to no sure land, guides thei
    |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ bad attribute argument
 
 error[E0452]: malformed lint attribute input
-  --> $DIR/reasons-erroneous.rs:12:23
+  --> $DIR/reasons-erroneous.rs:12:22
    |
-LL | #![warn(box_pointers, blerp = "or in league with robbers have reversed the signposts")]
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ bad attribute argument
+LL | #![warn(unsafe_code, blerp = "or in league with robbers have reversed the signposts")]
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ bad attribute argument
 
 error[E0452]: malformed lint attribute input
   --> $DIR/reasons-erroneous.rs:15:36
diff --git a/tests/crashes/116721.rs b/tests/ui/mir/sized-slice-predicate-116721.rs
index fc1a6530bc8..c6a0aca2da8 100644
--- a/tests/crashes/116721.rs
+++ b/tests/ui/mir/sized-slice-predicate-116721.rs
@@ -1,5 +1,6 @@
-//@ known-bug: #116721
+//@ build-pass
 //@ compile-flags: -Zmir-opt-level=3 --emit=mir
+
 fn hey<T>(it: &[T])
 where
     [T]: Clone,