bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Cleanup

Browse source
This commit is contained in:
Matt Peterson 2017-12-28 11:52:50 -05:00
parent 0f9c9b66bb
commit f55242583c
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libsyntax/ext/tt/macro_rules.rs
View file

@ -889,8 +889,8 @@ fn is_legal_fragment_specifier(sess: &ParseSess,
"item" | "block" | "stmt" | "expr" | "pat" | "item" | "block" | "stmt" | "expr" | "pat" |
"path" | "ty" | "ident" | "meta" | "tt" | "" => true, "path" | "ty" | "ident" | "meta" | "tt" | "" => true,
"lifetime" => { "lifetime" => {
if !features.borrow().macro_lifetime_matcher if !features.borrow().macro_lifetime_matcher &&
&& !attr::contains_name(attrs, "allow_internal_unstable") { !attr::contains_name(attrs, "allow_internal_unstable") {
let explain = feature_gate::EXPLAIN_LIFETIME_MATCHER; let explain = feature_gate::EXPLAIN_LIFETIME_MATCHER;
emit_feature_err(sess, emit_feature_err(sess,
"macro_lifetime_matcher", "macro_lifetime_matcher",
@ -901,8 +901,8 @@ fn is_legal_fragment_specifier(sess: &ParseSess,
true true
}, },
"vis" => { "vis" => {
if !features.borrow().macro_vis_matcher if !features.borrow().macro_vis_matcher &&
&& !attr::contains_name(attrs, "allow_internal_unstable") { !attr::contains_name(attrs, "allow_internal_unstable") {
let explain = feature_gate::EXPLAIN_VIS_MATCHER; let explain = feature_gate::EXPLAIN_VIS_MATCHER;
emit_feature_err(sess, emit_feature_err(sess,
"macro_vis_matcher", "macro_vis_matcher",

2
src/libsyntax/feature_gate.rs
View file

@ -523,7 +523,7 @@ declare_features! (
(accepted, loop_break_value, "1.19.0", Some(37339)), (accepted, loop_break_value, "1.19.0", Some(37339)),
// Permits numeric fields in struct expressions and patterns. // Permits numeric fields in struct expressions and patterns.
(accepted, relaxed_adts, "1.19.0", Some(35626)), (accepted, relaxed_adts, "1.19.0", Some(35626)),
// Coerces non capturing closures to function pointers // Coerces non capturing closures to function pointers
(accepted, closure_to_fn_coercion, "1.19.0", Some(39817)), (accepted, closure_to_fn_coercion, "1.19.0", Some(39817)),
// Allows attributes on struct literal fields. // Allows attributes on struct literal fields.
(accepted, struct_field_attributes, "1.20.0", Some(38814)), (accepted, struct_field_attributes, "1.20.0", Some(38814)),