Inline `DebruijnIndex` methods

[rust.git] / src / librustdoc / lib.rs

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 0d3ec7ecb6448052f90987cb3517c9f90c5f9971..7429f2b6ab148cd83ff7d26112b1caaa14026147 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -9,7 +9,7 @@
 #![feature(control_flow_enum)]
 #![feature(box_syntax)]
 #![feature(drain_filter)]
-#![feature(let_chains)]
+#![cfg_attr(bootstrap, feature(let_chains))]
 #![feature(let_else)]
 #![feature(test)]
 #![feature(never_type)]
@@ -366,7 +366,7 @@ fn opts() -> Vec<RustcOptGroup> {
             )
         }),
         unstable("Z", |o| {
-            o.optmulti("Z", "", "internal and debugging options (only on nightly build)", "FLAG")
+            o.optmulti("Z", "", "unstable / perma-unstable options (only on nightly build)", "FLAG")
         }),
         stable("sysroot", |o| o.optopt("", "sysroot", "Override the system root", "PATH")),
         unstable("playground-url", |o| {
@@ -745,7 +745,7 @@ fn main_options(options: config::Options) -> MainResult {
         options.error_format,
         None,
         options.diagnostic_width,
-        &options.debugging_opts,
+        &options.unstable_opts,
     );
 
     match (options.should_test, options.markdown_input()) {
@@ -787,7 +787,7 @@ fn main_options(options: config::Options) -> MainResult {
 
         if sess.opts.describe_lints {
             let mut lint_store = rustc_lint::new_lint_store(
-                sess.opts.debugging_opts.no_interleave_lints,
+                sess.opts.unstable_opts.no_interleave_lints,
                 sess.unstable_options(),
             );
             let registered_lints = if let Some(register_lints) = compiler.register_lints() {