diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 14 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 8 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 1fc5aed7e7a..e96a0e838cf 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -904,20 +904,8 @@ fn is_legal_fragment_specifier(sess: &ParseSess, frag_name: &str, frag_span: Span) -> bool { match frag_name { - "item" | "block" | "stmt" | "expr" | "pat" | + "item" | "block" | "stmt" | "expr" | "pat" | "lifetime" | "path" | "ty" | "ident" | "meta" | "tt" | "" => true, - "lifetime" => { - if !features.macro_lifetime_matcher && - !attr::contains_name(attrs, "allow_internal_unstable") { - let explain = feature_gate::EXPLAIN_LIFETIME_MATCHER; - emit_feature_err(sess, - "macro_lifetime_matcher", - frag_span, - GateIssue::Language, - explain); - } - true - }, "literal" => { if !features.macro_literal_matcher && !attr::contains_name(attrs, "allow_internal_unstable") { diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 562705462e2..cb5125fe9ef 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -396,9 +396,6 @@ declare_features! ( // Termination trait in tests (RFC 1937) (active, termination_trait_test, "1.24.0", Some(48854), Some(Edition::Edition2018)), - // Allows use of the :lifetime macro fragment specifier - (active, macro_lifetime_matcher, "1.24.0", Some(46895), None), - // `extern` in paths (active, extern_in_paths, "1.23.0", Some(44660), None), @@ -598,6 +595,8 @@ declare_features! ( (accepted, dyn_trait, "1.27.0", Some(44662), None), // allow `#[must_use]` on functions; and, must-use operators (RFC 1940) (accepted, fn_must_use, "1.27.0", Some(43302), None), + // Allows use of the :lifetime macro fragment specifier + (accepted, macro_lifetime_matcher, "1.27.0", Some(34303), None), ); // If you change this, please modify src/doc/unstable-book as well. You must @@ -1331,9 +1330,6 @@ pub const EXPLAIN_DERIVE_UNDERSCORE: &'static str = pub const EXPLAIN_VIS_MATCHER: &'static str = ":vis fragment specifier is experimental and subject to change"; -pub const EXPLAIN_LIFETIME_MATCHER: &'static str = - ":lifetime fragment specifier is experimental and subject to change"; - pub const EXPLAIN_LITERAL_MATCHER: &'static str = ":literal fragment specifier is experimental and subject to change"; |