about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-07-18 22:35:03 +0800
committerGitHub <noreply@github.com>2018-07-18 22:35:03 +0800
commit5624d2a29218e423a758268e60182906da31c9e8 (patch)
treee7762724371c77d32ef50d66c5f3c57c4e744acc
parentfa9f91d9b1f31a98bf3ac0c624590f4086dc8659 (diff)
parent5ecec1c58b980dee59e1421baa512eee5f042610 (diff)
downloadrust-5624d2a29218e423a758268e60182906da31c9e8.tar.gz
rust-5624d2a29218e423a758268e60182906da31c9e8.zip
Rollup merge of #52472 - alexcrichton:macros-edition-2018, r=petrochenkov
rustc: Enable `use_extern_macros` in 2018 edition

This was previously enabled via `proc_macro`, but since `proc_macro` is now
stable this is no longer the case. Explicitly include it in the 2018 edition
here.
-rw-r--r--src/libsyntax/feature_gate.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 2ef90e3ec47..84b5f9659b5 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -284,7 +284,7 @@ declare_features! (
     // Allows #[link(..., cfg(..))]
     (active, link_cfg, "1.14.0", Some(37406), None),
 
-    (active, use_extern_macros, "1.15.0", Some(35896), None),
+    (active, use_extern_macros, "1.15.0", Some(35896), Some(Edition::Edition2018)),
 
     // `extern "ptx-*" fn()`
     (active, abi_ptx, "1.15.0", Some(38788), None),