about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-21 02:30:35 +0000
committerbors <bors@rust-lang.org>2018-11-21 02:30:35 +0000
commit780658a464603fa755d94b27f72a375bd81d07ea (patch)
tree18787e8fd66be67f6a3dfee5a48bc604f530fdca /src/libsyntax
parentf1e2fa8f0469aac1ea69dd5b6164e1d198d57934 (diff)
parentd4934c748fd9bb74d08d38f240eadf3455777ffb (diff)
downloadrust-780658a464603fa755d94b27f72a375bd81d07ea.tar.gz
rust-780658a464603fa755d94b27f72a375bd81d07ea.zip
Auto merge of #56032 - petrochenkov:stabecip, r=nikomatsakis
Stabilize `extern_crate_item_prelude`

Closes https://github.com/rust-lang/rust/issues/55599
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index a7c97feee49..2f5db9bd081 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -499,9 +499,6 @@ declare_features! (
     // Allows `const _: TYPE = VALUE`
     (active, underscore_const_names, "1.31.0", Some(54912), None),
 
-    // `extern crate foo as bar;` puts `bar` into extern prelude.
-    (active, extern_crate_item_prelude, "1.31.0", Some(55599), None),
-
     // `reason = ` in lint attributes and `expect` lint attribute
     (active, lint_reasons, "1.31.0", Some(54503), None),
 );
@@ -691,6 +688,8 @@ declare_features! (
     // impl<I:Iterator> Iterator for &mut Iterator
     // impl Debug for Foo<'_>
     (accepted, impl_header_lifetime_elision, "1.31.0", Some(15872), None),
+    // `extern crate foo as bar;` puts `bar` into extern prelude.
+    (accepted, extern_crate_item_prelude, "1.31.0", Some(55599), None),
 );
 
 // If you change this, please modify src/doc/unstable-book as well. You must