diff --git a/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs b/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs
index 0721b051bcbd..71f1f15654b5 100644
--- a/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs
+++ b/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs
@@ -7,8 +7,6 @@
 // reaches the panic code when executed, despite the compiler warning
 // about that match arm being unreachable.
 
-#![feature(nll)]
-
 fn main() {
     let b = &mut true;
     match b {
diff --git a/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr b/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr
index 6993419326c8..51f9b464d766 100644
--- a/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr
+++ b/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr
@@ -1,5 +1,5 @@
 error[E0382]: use of moved value: `b`
-  --> $DIR/issue-27282-move-match-input-into-guard.rs:18:14
+  --> $DIR/issue-27282-move-match-input-into-guard.rs:16:14
    |
 LL |     let b = &mut true;
    |         - move occurs because `b` has type `&mut bool`, which does not implement the `Copy` trait
diff --git a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs
index e570b04a2bea..afa0ba780de4 100644
--- a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs
+++ b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs
@@ -1,11 +1,6 @@
 // Issue 27282: Example 1: This sidesteps the AST checks disallowing
 // mutable borrows in match guards by hiding the mutable borrow in a
 // guard behind a move (of the ref mut pattern id) within a closure.
-//
-// This example is not rejected by AST borrowck (and then reliably
-// segfaults when executed).
-
-#![feature(nll)]
 
 fn main() {
     match Some(&4) {
diff --git a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr
index c5a9dd98a159..30cf0d66afaf 100644
--- a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr
+++ b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr
@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of `foo` in pattern guard
-  --> $DIR/issue-27282-move-ref-mut-into-guard.rs:14:19
+  --> $DIR/issue-27282-move-ref-mut-into-guard.rs:9:19
    |
 LL |             if { (|| { let bar = foo; bar.take() })(); false } => {},
    |                   ^^             ---
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs
index 3fb13d66ccb3..d17d6f07f687 100644
--- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs
+++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs
@@ -9,8 +9,6 @@
 // diverges, and therefore a single final fake-read at the very end
 // after the final match arm would not suffice.
 
-#![feature(nll)]
-
 struct ForceFnOnce;
 
 fn main() {
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr
index 199407ad7746..188f0b25c308 100644
--- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr
+++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr
@@ -1,5 +1,5 @@
 error[E0510]: cannot mutably borrow `x` in match guard
-  --> $DIR/issue-27282-mutate-before-diverging-arm-1.rs:23:14
+  --> $DIR/issue-27282-mutate-before-diverging-arm-1.rs:21:14
    |
 LL |     match x {
    |           - value is immutable in match guard
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs
index f5eaae925db0..9c3e7e9978ec 100644
--- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs
+++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs
@@ -13,8 +13,6 @@
 // occurs in the pattern-match itself, and not in the guard
 // expression.
 
-#![feature(nll)]
-
 struct ForceFnOnce;
 
 fn main() {
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr
index 3c72cb02015a..f0a3151f4e12 100644
--- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr
+++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr
@@ -1,5 +1,5 @@
 error[E0510]: cannot mutably borrow `x` in match guard
-  --> $DIR/issue-27282-mutate-before-diverging-arm-2.rs:28:18
+  --> $DIR/issue-27282-mutate-before-diverging-arm-2.rs:26:18
    |
 LL |     match x {
    |           - value is immutable in match guard
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.rs b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.rs
index 4cf5bcd6b4f6..cff9e963e272 100644
--- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.rs
+++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.rs
@@ -8,7 +8,7 @@
 // This case is interesting because a borrow of **x is untracked, because **x is
 // immutable. However, for matches we care that **x refers to the same value
 // until we have chosen a match arm.
-#![feature(nll)]
+
 struct ForceFnOnce;
 fn main() {
     let mut x = &mut &Some(&2);
diff --git a/src/test/ui/issues/issue-29723.rs b/src/test/ui/issues/issue-29723.rs
index 41db52a1fada..ce91022f093d 100644
--- a/src/test/ui/issues/issue-29723.rs
+++ b/src/test/ui/issues/issue-29723.rs
@@ -1,5 +1,3 @@
-#![feature(nll)]
-
 // test for https://github.com/rust-lang/rust/issues/29723
 
 fn main() {
diff --git a/src/test/ui/issues/issue-29723.stderr b/src/test/ui/issues/issue-29723.stderr
index 7928af5d5a5c..04915ab5f951 100644
--- a/src/test/ui/issues/issue-29723.stderr
+++ b/src/test/ui/issues/issue-29723.stderr
@@ -1,5 +1,5 @@
 error[E0382]: use of moved value: `s`
-  --> $DIR/issue-29723.rs:12:13
+  --> $DIR/issue-29723.rs:10:13
    |
 LL |     let s = String::new();
    |         - move occurs because `s` has type `std::string::String`, which does not implement the `Copy` trait
diff --git a/src/test/ui/nll/borrowed-match-issue-45045.rs b/src/test/ui/nll/borrowed-match-issue-45045.rs
index 59516d8b444d..0cd8e956d309 100644
--- a/src/test/ui/nll/borrowed-match-issue-45045.rs
+++ b/src/test/ui/nll/borrowed-match-issue-45045.rs
@@ -1,7 +1,5 @@
 // Regression test for issue #45045
 
-#![feature(nll)]
-
 enum Xyz {
     A,
     B,
diff --git a/src/test/ui/nll/borrowed-match-issue-45045.stderr b/src/test/ui/nll/borrowed-match-issue-45045.stderr
index f8d4d56621de..1607304e6716 100644
--- a/src/test/ui/nll/borrowed-match-issue-45045.stderr
+++ b/src/test/ui/nll/borrowed-match-issue-45045.stderr
@@ -1,5 +1,5 @@
 error[E0503]: cannot use `e` because it was mutably borrowed
-  --> $DIR/borrowed-match-issue-45045.rs:15:9
+  --> $DIR/borrowed-match-issue-45045.rs:13:9
    |
 LL |     let f = &mut e;
    |             ------ borrow of `e` occurs here
diff --git a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs
index 2a1321c25510..99922cc51b0d 100644
--- a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs
+++ b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs
@@ -1,7 +1,5 @@
 // Test that the 'static bound from the Copy impl is respected. Regression test for #29149.
 
-#![feature(nll)]
-
 #[derive(Clone)] struct Foo<'a>(&'a u32);
 impl Copy for Foo<'static> {}
 
diff --git a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr
index bf5c571b455b..b811ba4fd0cd 100644
--- a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr
+++ b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr
@@ -1,5 +1,5 @@
 error[E0597]: `s` does not live long enough
-  --> $DIR/do-not-ignore-lifetime-bounds-in-copy.rs:10:17
+  --> $DIR/do-not-ignore-lifetime-bounds-in-copy.rs:8:17
    |
 LL |     let a = Foo(&s);
    |                 ^^ borrowed value does not live long enough
diff --git a/src/test/ui/nll/enum-drop-access.rs b/src/test/ui/nll/enum-drop-access.rs
index dc436d20fd85..5ef0c3fe73db 100644
--- a/src/test/ui/nll/enum-drop-access.rs
+++ b/src/test/ui/nll/enum-drop-access.rs
@@ -1,5 +1,3 @@
-#![feature(nll)]
-
 enum DropOption<T> {
     Some(T),
     None,
diff --git a/src/test/ui/nll/enum-drop-access.stderr b/src/test/ui/nll/enum-drop-access.stderr
index 699179fd52fd..a532ae121a6e 100644
--- a/src/test/ui/nll/enum-drop-access.stderr
+++ b/src/test/ui/nll/enum-drop-access.stderr
@@ -1,5 +1,5 @@
 error[E0713]: borrow may still be in use when destructor runs
-  --> $DIR/enum-drop-access.rs:15:31
+  --> $DIR/enum-drop-access.rs:13:31
    |
 LL | fn drop_enum(opt: DropOption<&mut i32>) -> Option<&mut i32> {
    |                              - let's call the lifetime of this reference `'1`
@@ -13,7 +13,7 @@ LL | }
    | - here, drop of `opt` needs exclusive access to `*opt.0`, because the type `DropOption<&mut i32>` implements the `Drop` trait
 
 error[E0713]: borrow may still be in use when destructor runs
-  --> $DIR/enum-drop-access.rs:24:36
+  --> $DIR/enum-drop-access.rs:22:36
    |
 LL | fn optional_drop_enum(opt: Option<DropOption<&mut i32>>) -> Option<&mut i32> {
    |                                              - let's call the lifetime of this reference `'1`
diff --git a/src/test/ui/nll/issue-21232-partial-init-and-use.rs b/src/test/ui/nll/issue-21232-partial-init-and-use.rs
index 7da47c85f545..1836f766cc7e 100644
--- a/src/test/ui/nll/issue-21232-partial-init-and-use.rs
+++ b/src/test/ui/nll/issue-21232-partial-init-and-use.rs
@@ -12,8 +12,6 @@
 // tests that are meant to continue failing to compile once
 // rust-lang/rust#54987 is implemented.
 
-#![feature(nll)]
-
 struct S<Y> {
     x: u32,
 
diff --git a/src/test/ui/nll/issue-21232-partial-init-and-use.stderr b/src/test/ui/nll/issue-21232-partial-init-and-use.stderr
index 32147898320c..9e69262b3890 100644
--- a/src/test/ui/nll/issue-21232-partial-init-and-use.stderr
+++ b/src/test/ui/nll/issue-21232-partial-init-and-use.stderr
@@ -1,17 +1,17 @@
 error[E0381]: assign to part of possibly-uninitialized variable: `s`
-  --> $DIR/issue-21232-partial-init-and-use.rs:99:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:97:5
    |
 LL |     s.x = 10; s.y = Box::new(20);
    |     ^^^^^^^^ use of possibly-uninitialized `s`
 
 error[E0381]: assign to part of possibly-uninitialized variable: `t`
-  --> $DIR/issue-21232-partial-init-and-use.rs:106:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:104:5
    |
 LL |     t.0 = 10; t.1 = Box::new(20);
    |     ^^^^^^^^ use of possibly-uninitialized `t`
 
 error[E0382]: assign to part of moved value: `s`
-  --> $DIR/issue-21232-partial-init-and-use.rs:113:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:111:5
    |
 LL |     let mut s: S<B> = S::new(); drop(s);
    |         -----                        - value moved here
@@ -21,7 +21,7 @@ LL |     s.x = 10; s.y = Box::new(20);
    |     ^^^^^^^^ value partially assigned here after move
 
 error[E0382]: assign to part of moved value: `t`
-  --> $DIR/issue-21232-partial-init-and-use.rs:120:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:118:5
    |
 LL |     let mut t: T = (0, Box::new(0)); drop(t);
    |         -----                             - value moved here
@@ -31,19 +31,19 @@ LL |     t.0 = 10; t.1 = Box::new(20);
    |     ^^^^^^^^ value partially assigned here after move
 
 error[E0381]: assign to part of possibly-uninitialized variable: `s`
-  --> $DIR/issue-21232-partial-init-and-use.rs:127:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:125:5
    |
 LL |     s.x = 10;
    |     ^^^^^^^^ use of possibly-uninitialized `s`
 
 error[E0381]: assign to part of possibly-uninitialized variable: `t`
-  --> $DIR/issue-21232-partial-init-and-use.rs:134:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:132:5
    |
 LL |     t.0 = 10;
    |     ^^^^^^^^ use of possibly-uninitialized `t`
 
 error[E0382]: assign to part of moved value: `s`
-  --> $DIR/issue-21232-partial-init-and-use.rs:141:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:139:5
    |
 LL |     let mut s: S<B> = S::new(); drop(s);
    |         -----                        - value moved here
@@ -53,7 +53,7 @@ LL |     s.x = 10;
    |     ^^^^^^^^ value partially assigned here after move
 
 error[E0382]: assign to part of moved value: `t`
-  --> $DIR/issue-21232-partial-init-and-use.rs:148:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:146:5
    |
 LL |     let mut t: T = (0, Box::new(0)); drop(t);
    |         -----                             - value moved here
@@ -63,31 +63,31 @@ LL |     t.0 = 10;
    |     ^^^^^^^^ value partially assigned here after move
 
 error[E0381]: assign to part of possibly-uninitialized variable: `s`
-  --> $DIR/issue-21232-partial-init-and-use.rs:155:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:153:5
    |
 LL |     s.x = 10;
    |     ^^^^^^^^ use of possibly-uninitialized `s`
 
 error[E0381]: assign to part of possibly-uninitialized variable: `t`
-  --> $DIR/issue-21232-partial-init-and-use.rs:162:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:160:5
    |
 LL |     t.0 = 10;
    |     ^^^^^^^^ use of possibly-uninitialized `t`
 
 error[E0381]: assign to part of possibly-uninitialized variable: `q`
-  --> $DIR/issue-21232-partial-init-and-use.rs:178:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:176:5
    |
 LL |     q.r.f.x = 10; q.r.f.y = Box::new(20);
    |     ^^^^^^^^^^^^ use of possibly-uninitialized `q.r.f`
 
 error[E0381]: assign to part of possibly-uninitialized variable: `q`
-  --> $DIR/issue-21232-partial-init-and-use.rs:185:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:183:5
    |
 LL |     q.r.f.0 = 10; q.r.f.1 = Box::new(20);
    |     ^^^^^^^^^^^^ use of possibly-uninitialized `q.r.f`
 
 error[E0382]: assign to part of moved value: `q.r`
-  --> $DIR/issue-21232-partial-init-and-use.rs:192:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:190:5
    |
 LL |     let mut q: Q<S<B>> = Q::new(S::new()); drop(q.r);
    |                                                 --- value moved here
@@ -97,7 +97,7 @@ LL |     q.r.f.x = 10; q.r.f.y = Box::new(20);
    = note: move occurs because `q.r` has type `R<S<std::boxed::Box<u32>>>`, which does not implement the `Copy` trait
 
 error[E0382]: assign to part of moved value: `q.r`
-  --> $DIR/issue-21232-partial-init-and-use.rs:199:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:197:5
    |
 LL |     let mut q: Q<T> = Q::new((0, Box::new(0))); drop(q.r);
    |                                                      --- value moved here
@@ -107,19 +107,19 @@ LL |     q.r.f.0 = 10; q.r.f.1 = Box::new(20);
    = note: move occurs because `q.r` has type `R<(u32, std::boxed::Box<u32>)>`, which does not implement the `Copy` trait
 
 error[E0381]: assign to part of possibly-uninitialized variable: `q`
-  --> $DIR/issue-21232-partial-init-and-use.rs:206:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:204:5
    |
 LL |     q.r.f.x = 10;
    |     ^^^^^^^^^^^^ use of possibly-uninitialized `q.r.f`
 
 error[E0381]: assign to part of possibly-uninitialized variable: `q`
-  --> $DIR/issue-21232-partial-init-and-use.rs:213:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:211:5
    |
 LL |     q.r.f.0 = 10;
    |     ^^^^^^^^^^^^ use of possibly-uninitialized `q.r.f`
 
 error[E0382]: assign to part of moved value: `q.r`
-  --> $DIR/issue-21232-partial-init-and-use.rs:220:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:218:5
    |
 LL |     let mut q: Q<S<B>> = Q::new(S::new()); drop(q.r);
    |                                                 --- value moved here
@@ -129,7 +129,7 @@ LL |     q.r.f.x = 10;
    = note: move occurs because `q.r` has type `R<S<std::boxed::Box<u32>>>`, which does not implement the `Copy` trait
 
 error[E0382]: assign to part of moved value: `q.r`
-  --> $DIR/issue-21232-partial-init-and-use.rs:227:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:225:5
    |
 LL |     let mut q: Q<T> = Q::new((0, Box::new(0))); drop(q.r);
    |                                                      --- value moved here
@@ -139,19 +139,19 @@ LL |     q.r.f.0 = 10;
    = note: move occurs because `q.r` has type `R<(u32, std::boxed::Box<u32>)>`, which does not implement the `Copy` trait
 
 error[E0381]: assign to part of possibly-uninitialized variable: `q`
-  --> $DIR/issue-21232-partial-init-and-use.rs:234:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:232:5
    |
 LL |     q.r.f.x = 10;
    |     ^^^^^^^^^^^^ use of possibly-uninitialized `q.r.f`
 
 error[E0381]: assign to part of possibly-uninitialized variable: `q`
-  --> $DIR/issue-21232-partial-init-and-use.rs:241:5
+  --> $DIR/issue-21232-partial-init-and-use.rs:239:5
    |
 LL |     q.r.f.0 = 10;
    |     ^^^^^^^^^^^^ use of possibly-uninitialized `q.r.f`
 
 error[E0382]: assign to part of moved value: `c`
-  --> $DIR/issue-21232-partial-init-and-use.rs:259:13
+  --> $DIR/issue-21232-partial-init-and-use.rs:257:13
    |
 LL |     let mut c = (1, "".to_owned());
    |         ----- move occurs because `c` has type `(i32, std::string::String)`, which does not implement the `Copy` trait
@@ -162,7 +162,7 @@ LL |             c.0 = 2;
    |             ^^^^^^^ value partially assigned here after move
 
 error[E0382]: assign to part of moved value: `c`
-  --> $DIR/issue-21232-partial-init-and-use.rs:269:13
+  --> $DIR/issue-21232-partial-init-and-use.rs:267:13
    |
 LL |     let mut c = (1, (1, "".to_owned()));
    |         ----- move occurs because `c` has type `(i32, (i32, std::string::String))`, which does not implement the `Copy` trait
@@ -173,7 +173,7 @@ LL |             (c.1).0 = 2;
    |             ^^^^^^^^^^^ value partially assigned here after move
 
 error[E0382]: assign to part of moved value: `c.1`
-  --> $DIR/issue-21232-partial-init-and-use.rs:277:13
+  --> $DIR/issue-21232-partial-init-and-use.rs:275:13
    |
 LL |         c2 => {
    |         -- value moved here
diff --git a/src/test/ui/nll/issue-48238.rs b/src/test/ui/nll/issue-48238.rs
index 2e64ea72db28..d2e9285fa413 100644
--- a/src/test/ui/nll/issue-48238.rs
+++ b/src/test/ui/nll/issue-48238.rs
@@ -1,7 +1,5 @@
 // Regression test for issue #48238
 
-#![feature(nll)]
-
 fn use_val<'a>(val: &'a u8) -> &'a u8 {
     val
 }
diff --git a/src/test/ui/nll/issue-48238.stderr b/src/test/ui/nll/issue-48238.stderr
index 05a90eec05c3..0aa1eedad9fd 100644
--- a/src/test/ui/nll/issue-48238.stderr
+++ b/src/test/ui/nll/issue-48238.stderr
@@ -1,5 +1,5 @@
 error: lifetime may not live long enough
-  --> $DIR/issue-48238.rs:11:13
+  --> $DIR/issue-48238.rs:9:13
    |
 LL |     move || use_val(&orig);
    |     ------- ^^^^^^^^^^^^^^ returning this value requires that `'1` must outlive `'2`
diff --git a/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.rs b/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.rs
index 58416c31edde..7ea1c445d143 100644
--- a/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.rs
+++ b/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.rs
@@ -3,8 +3,6 @@
 // one of its fields, it is useful to be reminded of the significance
 // of the fact that the type implements Drop.
 
-#![feature(nll)]
-
 pub struct S<'a> { url: &'a mut String }
 
 impl<'a> Drop for S<'a> { fn drop(&mut self) { } }
diff --git a/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.stderr b/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.stderr
index ce48457abe7e..1a1250ff9353 100644
--- a/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.stderr
+++ b/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.stderr
@@ -1,5 +1,5 @@
 error[E0713]: borrow may still be in use when destructor runs
-  --> $DIR/issue-52059-report-when-borrow-and-drop-conflict.rs:13:5
+  --> $DIR/issue-52059-report-when-borrow-and-drop-conflict.rs:11:5
    |
 LL | fn finish_1(s: S) -> &mut String {
    |             - has type `S<'1>`
@@ -9,7 +9,7 @@ LL | }
    | - here, drop of `s` needs exclusive access to `*s.url`, because the type `S<'_>` implements the `Drop` trait
 
 error[E0713]: borrow may still be in use when destructor runs
-  --> $DIR/issue-52059-report-when-borrow-and-drop-conflict.rs:18:13
+  --> $DIR/issue-52059-report-when-borrow-and-drop-conflict.rs:16:13
    |
 LL | fn finish_2(s: S) -> &mut String {
    |             - has type `S<'1>`
@@ -19,7 +19,7 @@ LL | }
    | - here, drop of `s` needs exclusive access to `*s.url`, because the type `S<'_>` implements the `Drop` trait
 
 error[E0713]: borrow may still be in use when destructor runs
-  --> $DIR/issue-52059-report-when-borrow-and-drop-conflict.rs:23:21
+  --> $DIR/issue-52059-report-when-borrow-and-drop-conflict.rs:21:21
    |
 LL | fn finish_3(s: S) -> &mut String {
    |             - has type `S<'1>`
@@ -29,7 +29,7 @@ LL | }
    | - here, drop of `s` needs exclusive access to `*s.url`, because the type `S<'_>` implements the `Drop` trait
 
 error[E0509]: cannot move out of type `S<'_>`, which implements the `Drop` trait
-  --> $DIR/issue-52059-report-when-borrow-and-drop-conflict.rs:28:13
+  --> $DIR/issue-52059-report-when-borrow-and-drop-conflict.rs:26:13
    |
 LL |     let p = s.url; p
    |             ^^^^^
diff --git a/src/test/ui/nll/issue-53040.rs b/src/test/ui/nll/issue-53040.rs
index 8ce24c8ede9a..e4ee6e913f68 100644
--- a/src/test/ui/nll/issue-53040.rs
+++ b/src/test/ui/nll/issue-53040.rs
@@ -1,5 +1,3 @@
-#![feature(nll)]
-
 fn main() {
     let mut v: Vec<()> = Vec::new();
     || &mut v;
diff --git a/src/test/ui/nll/issue-53040.stderr b/src/test/ui/nll/issue-53040.stderr
index 9e7e63af87db..7cba32c67432 100644
--- a/src/test/ui/nll/issue-53040.stderr
+++ b/src/test/ui/nll/issue-53040.stderr
@@ -1,5 +1,5 @@
 error: captured variable cannot escape `FnMut` closure body
-  --> $DIR/issue-53040.rs:5:8
+  --> $DIR/issue-53040.rs:3:8
    |
 LL |     || &mut v;
    |      - ^^^^^^ returns a reference to a captured variable which escapes the closure body
diff --git a/src/test/ui/nll/issue-53773.rs b/src/test/ui/nll/issue-53773.rs
index 62e1631dcf36..ed971b6ce0e1 100644
--- a/src/test/ui/nll/issue-53773.rs
+++ b/src/test/ui/nll/issue-53773.rs
@@ -1,5 +1,3 @@
-#![feature(nll)]
-
 struct Archive;
 struct ArchiveIterator<'a> {
     x: &'a Archive,
diff --git a/src/test/ui/nll/issue-53773.stderr b/src/test/ui/nll/issue-53773.stderr
index 1933ef7a2dbc..45831460e523 100644
--- a/src/test/ui/nll/issue-53773.stderr
+++ b/src/test/ui/nll/issue-53773.stderr
@@ -1,5 +1,5 @@
 error[E0713]: borrow may still be in use when destructor runs
-  --> $DIR/issue-53773.rs:43:22
+  --> $DIR/issue-53773.rs:41:22
    |
 LL |         members.push(child.raw);
    |                      ^^^^^^^^^
diff --git a/src/test/ui/nll/issue-57100.rs b/src/test/ui/nll/issue-57100.rs
index f669fe00956e..c7f3e9d73036 100644
--- a/src/test/ui/nll/issue-57100.rs
+++ b/src/test/ui/nll/issue-57100.rs
@@ -1,5 +1,4 @@
 #![allow(unused)]
-#![feature(nll)]
 
 // ignore-tidy-linelength
 
diff --git a/src/test/ui/nll/issue-57100.stderr b/src/test/ui/nll/issue-57100.stderr
index 5d5c86c34875..5f733c14036b 100644
--- a/src/test/ui/nll/issue-57100.stderr
+++ b/src/test/ui/nll/issue-57100.stderr
@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `r.r2_union.f3_union` (via `r.r2_union.f3_union.s2_leaf.l1_u8`) as immutable because it is also borrowed as mutable (via `r.r2_union.f3_union.s1_leaf.l1_u8`)
-  --> $DIR/issue-57100.rs:44:20
+  --> $DIR/issue-57100.rs:43:20
    |
 LL |         let mref = &mut r.r2_union.f3_union.s1_leaf.l1_u8;
    |                    -------------------------------------- mutable borrow occurs here (via `r.r2_union.f3_union.s1_leaf.l1_u8`)
@@ -13,7 +13,7 @@ LL |         println!("{} {}", mref, nref)
    = note: `r.r2_union.f3_union.s2_leaf.l1_u8` is a field of the union `Second`, so it overlaps the field `r.r2_union.f3_union.s1_leaf.l1_u8`
 
 error[E0502]: cannot borrow `r.r2_union` (via `r.r2_union.f1_leaf.l1_u8`) as immutable because it is also borrowed as mutable (via `r.r2_union.f2_leaf.l1_u8`)
-  --> $DIR/issue-57100.rs:62:20
+  --> $DIR/issue-57100.rs:61:20
    |
 LL |         let mref = &mut r.r2_union.f2_leaf.l1_u8;
    |                    ----------------------------- mutable borrow occurs here (via `r.r2_union.f2_leaf.l1_u8`)
diff --git a/src/test/ui/nll/match-guards-always-borrow.rs b/src/test/ui/nll/match-guards-always-borrow.rs
index d423730bdbc3..87dba187ba2c 100644
--- a/src/test/ui/nll/match-guards-always-borrow.rs
+++ b/src/test/ui/nll/match-guards-always-borrow.rs
@@ -1,5 +1,3 @@
-#![feature(nll)]
-
 // Here is arielb1's basic example from rust-lang/rust#27282
 // that AST borrowck is flummoxed by:
 
diff --git a/src/test/ui/nll/match-guards-always-borrow.stderr b/src/test/ui/nll/match-guards-always-borrow.stderr
index 5b49db45a52e..15f94043b430 100644
--- a/src/test/ui/nll/match-guards-always-borrow.stderr
+++ b/src/test/ui/nll/match-guards-always-borrow.stderr
@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of `foo` in pattern guard
-  --> $DIR/match-guards-always-borrow.rs:10:14
+  --> $DIR/match-guards-always-borrow.rs:8:14
    |
 LL |             (|| { let bar = foo; bar.take() })();
    |              ^^             ---
diff --git a/src/test/ui/nll/match-on-borrowed.rs b/src/test/ui/nll/match-on-borrowed.rs
index edce2b185df3..aba0a7f71f5c 100644
--- a/src/test/ui/nll/match-on-borrowed.rs
+++ b/src/test/ui/nll/match-on-borrowed.rs
@@ -5,8 +5,6 @@
 // Test that we don't allow mutating the value being matched on in a way that
 // changes which patterns it matches, until we have chosen an arm.
 
-#![feature(nll)]
-
 struct A(i32, i32);
 
 fn struct_example(mut a: A) {
diff --git a/src/test/ui/nll/match-on-borrowed.stderr b/src/test/ui/nll/match-on-borrowed.stderr
index 284a910a01b8..f9c9a8463221 100644
--- a/src/test/ui/nll/match-on-borrowed.stderr
+++ b/src/test/ui/nll/match-on-borrowed.stderr
@@ -1,5 +1,5 @@
 error[E0503]: cannot use `e` because it was mutably borrowed
-  --> $DIR/match-on-borrowed.rs:51:9
+  --> $DIR/match-on-borrowed.rs:49:9
    |
 LL |         E::V(ref mut x, _) => x,
    |              --------- borrow of `e.0` occurs here
@@ -11,7 +11,7 @@ LL |     x;
    |     - borrow later used here
 
 error[E0503]: cannot use `*f` because it was mutably borrowed
-  --> $DIR/match-on-borrowed.rs:64:9
+  --> $DIR/match-on-borrowed.rs:62:9
    |
 LL |         E::V(ref mut x, _) => x,
    |              --------- borrow of `f.0` occurs here
@@ -23,7 +23,7 @@ LL |     x;
    |     - borrow later used here
 
 error[E0503]: cannot use `t` because it was mutably borrowed
-  --> $DIR/match-on-borrowed.rs:82:9
+  --> $DIR/match-on-borrowed.rs:80:9
    |
 LL |     let x = &mut t;
    |             ------ borrow of `t` occurs here
@@ -35,7 +35,7 @@ LL |     x;
    |     - borrow later used here
 
 error[E0381]: use of possibly-uninitialized variable: `n`
-  --> $DIR/match-on-borrowed.rs:92:11
+  --> $DIR/match-on-borrowed.rs:90:11
    |
 LL |     match n {}
    |           ^ use of possibly-uninitialized `n`