about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-04 02:31:46 +0000
committerbors <bors@rust-lang.org>2019-04-04 02:31:46 +0000
commita5dfdc589a1b44f01cb640cd0244372dcbbd6f37 (patch)
tree2e64cd0111d47ed14ffdfbde912e5a746ac8b454 /src/bootstrap
parent314a79cd80ed905f80d24b79fd7acb4c8c72789b (diff)
parent231bd482c6d2f2aae463f2d5b57ed3c8f5a0803e (diff)
downloadrust-a5dfdc589a1b44f01cb640cd0244372dcbbd6f37.tar.gz
rust-a5dfdc589a1b44f01cb640cd0244372dcbbd6f37.zip
Auto merge of #59684 - Centril:rollup-n7pnare, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #59316 (Internal lints take 2)
 - #59663 (Be more direct about borrow contract)
 - #59664 (Updated the documentation of spin_loop and spin_loop_hint)
 - #59666 (Updated the environment description in rustc.)
 - #59669 (Reduce repetition in librustc(_lint) wrt. impl LintPass by using macros)
 - #59677 (rustfix coverage: Skip UI tests with non-json error-format)

Failed merges:

r? @ghost
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/bin/rustc.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index 7429492f914..86ce5fd01a8 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -316,6 +316,11 @@ fn main() {
         }
     }
 
+    // This is required for internal lints.
+    if stage != "0" {
+        cmd.arg("-Zunstable-options");
+    }
+
     // Force all crates compiled by this compiler to (a) be unstable and (b)
     // allow the `rustc_private` feature to link to other unstable crates
     // also in the sysroot. We also do this for host crates, since those