From 69e91992efd9a3dace6fece3ffe23c4ead4c507c Mon Sep 17 00:00:00 2001
From: Jack Huey <31162821+jackh726@users.noreply.github.com>
Date: Fri, 1 Apr 2022 13:13:25 -0400
Subject: [PATCH] Fully stabilize NLL

---
 alloc/src/lib.rs             | 1 -
 panic_abort/src/lib.rs       | 1 -
 panic_unwind/src/lib.rs      | 1 -
 proc_macro/src/lib.rs        | 1 -
 profiler_builtins/src/lib.rs | 1 -
 std/src/keyword_docs.rs      | 2 +-
 std/src/lib.rs               | 2 +-
 test/src/lib.rs              | 1 -
 unwind/src/lib.rs            | 1 -
 9 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/alloc/src/lib.rs b/alloc/src/lib.rs
index 710a39852..40b7a4935 100644
--- a/alloc/src/lib.rs
+++ b/alloc/src/lib.rs
@@ -166,7 +166,6 @@
 #![feature(min_specialization)]
 #![feature(negative_impls)]
 #![feature(never_type)]
-#![feature(nll)] // Not necessary, but here to test the `nll` feature.
 #![feature(rustc_allow_const_fn_unstable)]
 #![feature(rustc_attrs)]
 #![feature(slice_internals)]
diff --git a/panic_abort/src/lib.rs b/panic_abort/src/lib.rs
index 0a1aa7bb3..6a01b4a2e 100644
--- a/panic_abort/src/lib.rs
+++ b/panic_abort/src/lib.rs
@@ -9,7 +9,6 @@
 #![panic_runtime]
 #![allow(unused_features)]
 #![feature(core_intrinsics)]
-#![feature(nll)]
 #![feature(panic_runtime)]
 #![feature(std_internals)]
 #![feature(staged_api)]
diff --git a/panic_unwind/src/lib.rs b/panic_unwind/src/lib.rs
index 4ae5f8ae4..f9acb42c4 100644
--- a/panic_unwind/src/lib.rs
+++ b/panic_unwind/src/lib.rs
@@ -16,7 +16,6 @@
 #![doc(issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/")]
 #![feature(core_intrinsics)]
 #![feature(lang_items)]
-#![feature(nll)]
 #![feature(panic_unwind)]
 #![feature(staged_api)]
 #![feature(std_internals)]
diff --git a/proc_macro/src/lib.rs b/proc_macro/src/lib.rs
index f1c5eaad8..30ad3d238 100644
--- a/proc_macro/src/lib.rs
+++ b/proc_macro/src/lib.rs
@@ -21,7 +21,6 @@
 // Please avoid unstable features where possible to minimize the amount of changes necessary
 // to make it compile with rust-analyzer on stable.
 #![feature(rustc_allow_const_fn_unstable)]
-#![feature(nll)]
 #![feature(staged_api)]
 #![feature(allow_internal_unstable)]
 #![feature(decl_macro)]
diff --git a/profiler_builtins/src/lib.rs b/profiler_builtins/src/lib.rs
index bb1f2785d..0c83bcee0 100644
--- a/profiler_builtins/src/lib.rs
+++ b/profiler_builtins/src/lib.rs
@@ -7,5 +7,4 @@
     issue = "none"
 )]
 #![allow(unused_features)]
-#![feature(nll)]
 #![feature(staged_api)]
diff --git a/std/src/keyword_docs.rs b/std/src/keyword_docs.rs
index 6dcd55cc9..52a02e998 100644
--- a/std/src/keyword_docs.rs
+++ b/std/src/keyword_docs.rs
@@ -2167,7 +2167,7 @@ mod use_keyword {}
 /// is missing: the `'b` lifetime is not known to live at least as long as `'a`
 /// which means this function cannot ensure it always returns a valid reference:
 ///
-/// ```rust,compile_fail,E0623
+/// ```rust,compile_fail
 /// fn select<'a, 'b>(s1: &'a str, s2: &'b str, second: bool) -> &'a str
 /// {
 ///     if second { s2 } else { s1 }
diff --git a/std/src/lib.rs b/std/src/lib.rs
index 71ea5f1a1..b1c68ec43 100644
--- a/std/src/lib.rs
+++ b/std/src/lib.rs
@@ -248,7 +248,7 @@
 #![feature(needs_panic_runtime)]
 #![feature(negative_impls)]
 #![feature(never_type)]
-#![feature(nll)]
+#![cfg_attr(bootstrap, feature(nll))]
 #![feature(platform_intrinsics)]
 #![feature(prelude_import)]
 #![feature(rustc_attrs)]
diff --git a/test/src/lib.rs b/test/src/lib.rs
index 0c748da1a..3b7193adc 100644
--- a/test/src/lib.rs
+++ b/test/src/lib.rs
@@ -15,7 +15,6 @@
 
 #![unstable(feature = "test", issue = "50297")]
 #![doc(test(attr(deny(warnings))))]
-#![feature(nll)]
 #![feature(bench_black_box)]
 #![feature(internal_output_capture)]
 #![feature(staged_api)]
diff --git a/unwind/src/lib.rs b/unwind/src/lib.rs
index c92a7d310..15254bc75 100644
--- a/unwind/src/lib.rs
+++ b/unwind/src/lib.rs
@@ -2,7 +2,6 @@
 #![unstable(feature = "panic_unwind", issue = "32837")]
 #![feature(link_cfg)]
 #![feature(native_link_modifiers_bundle)]
-#![feature(nll)]
 #![feature(staged_api)]
 #![feature(c_unwind)]
 #![feature(cfg_target_abi)]