about summary refs log tree commit diff
path: root/src/librustc_plugin
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-08-22 11:15:10 +0000
committerbors <bors@rust-lang.org>2017-08-22 11:15:10 +0000
commit1177911790def5b20f2e4bdfa8bd59df0a51f4e7 (patch)
tree98d605deb5c901a8fd27f8ffbba93b8b497ff0b3 /src/librustc_plugin
parent7e5578da8c76fafcb1d7ca9f0643127da76f0879 (diff)
parent472e7e3ee22993d7dd64bdba21304334e0e977c9 (diff)
downloadrust-1177911790def5b20f2e4bdfa8bd59df0a51f4e7.tar.gz
rust-1177911790def5b20f2e4bdfa8bd59df0a51f4e7.zip
Auto merge of #44008 - RalfJung:staged1, r=alexcrichton
Make sure crates not opting in to staged_api don't use staged_api

This also fixes the problem that with `-Zforce-unstable-if-unmarked` set, crates could not use `#[deprecated]`.

If you prefer, I can instead submit another version which just fixes this problem, but still allows the staged API attributes for all crates when  `-Zforce-unstable-if-unmarked` is set. I have prepared that at <https://github.com/RalfJung/rust/tree/staged2>. As yet another alternative, @alexcrichton suggested to turn this error into a lint, but that seems to be much more work, so is it worth it?

Cc @alexcrichton #43975
Diffstat (limited to 'src/librustc_plugin')
-rw-r--r--src/librustc_plugin/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_plugin/lib.rs b/src/librustc_plugin/lib.rs
index 1020cec9a86..602b71dca05 100644
--- a/src/librustc_plugin/lib.rs
+++ b/src/librustc_plugin/lib.rs
@@ -69,6 +69,7 @@
 #![deny(warnings)]
 
 #![feature(rustc_diagnostic_macros)]
+#![feature(staged_api)]
 
 #[macro_use] extern crate syntax;