Skip to content

Commit

Permalink
Stabilize feature(macro_attributes_in_derive_output)
Browse files Browse the repository at this point in the history
  • Loading branch information
@petrochenkov
petrochenkov committed Sep 24, 2021
1 parent 92804cd commit 85f0290
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 142 deletions.
2 changes: 2 additions & 0 deletions compiler/rustc_feature/src/accepted.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ declare_features! (
(accepted, const_fn_union, "1.56.0", Some(51909), None),
/// Allows explicit discriminants on non-unit enum variants.
(accepted, arbitrary_enum_discriminant, "1.56.0", Some(60553), None),
/// Allows macro attributes to observe output of `#[derive]`.
(accepted, macro_attributes_in_derive_output, "1.57.0", Some(81119), None),

// -------------------------------------------------------------------------
// feature-group-end: accepted features
Expand Down
3 changes: 0 additions & 3 deletions compiler/rustc_feature/src/active.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,9 +592,6 @@ declare_features! (
/// Lessens the requirements for structs to implement `Unsize`.
(active, relaxed_struct_unsize, "1.51.0", Some(81793), None),

/// Allows macro attributes to observe output of `#[derive]`.
(active, macro_attributes_in_derive_output, "1.51.0", Some(81119), None),

/// Allows associated types in inherent impls.
(incomplete, inherent_associated_types, "1.52.0", Some(8995), None),

Expand Down
32 changes: 0 additions & 32 deletions compiler/rustc_resolve/src/macros.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,38 +311,6 @@ impl<'a> ResolverExpand for Resolver<'a> {
self.create_stable_hashing_context(),
);

if let Res::Def(_, _) = res {
// Gate macro attributes in `#[derive]` output.
if !self.session.features_untracked().macro_attributes_in_derive_output
&& kind == MacroKind::Attr
&& ext.builtin_name != Some(sym::derive)
{
let mut expn_id = parent_scope.expansion;
loop {
// Helper attr table is a quick way to determine whether the attr is `derive`.
if self.helper_attrs.contains_key(&expn_id) {
feature_err(
&self.session.parse_sess,
sym::macro_attributes_in_derive_output,
path.span,
"macro attributes in `#[derive]` output are unstable",
)
.emit();
break;
} else {
let expn_data = expn_id.expn_data();
match expn_data.kind {
ExpnKind::Root
| ExpnKind::Macro(MacroKind::Bang | MacroKind::Derive, _) => {
break;
}
_ => expn_id = expn_data.parent.expect_local(),
}
}
}
}
}

Ok(ext)
}

Expand Down
37 changes: 0 additions & 37 deletions src/test/ui/proc-macro/attribute-after-derive-feature-gate.rs
View file

This file was deleted.

30 changes: 0 additions & 30 deletions src/test/ui/proc-macro/attribute-after-derive-feature-gate.stderr
View file

This file was deleted.

2 changes: 0 additions & 2 deletions src/test/ui/proc-macro/attribute-after-derive.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
// compile-flags: -Z span-debug
// aux-build: test-macros.rs

#![feature(macro_attributes_in_derive_output)]

#![no_std] // Don't load unnecessary hygiene information from std
extern crate std;

Expand Down
76 changes: 38 additions & 38 deletions src/test/ui/proc-macro/attribute-after-derive.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,190 +3,190 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/attribute-after-derive.rs:17:1: 17:2 (#0),
span: $DIR/attribute-after-derive.rs:15:1: 15:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "derive",
span: $DIR/attribute-after-derive.rs:17:3: 17:9 (#0),
span: $DIR/attribute-after-derive.rs:15:3: 15:9 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "Print",
span: $DIR/attribute-after-derive.rs:17:10: 17:15 (#0),
span: $DIR/attribute-after-derive.rs:15:10: 15:15 (#0),
},
],
span: $DIR/attribute-after-derive.rs:17:9: 17:16 (#0),
span: $DIR/attribute-after-derive.rs:15:9: 15:16 (#0),
},
],
span: $DIR/attribute-after-derive.rs:17:2: 17:17 (#0),
span: $DIR/attribute-after-derive.rs:15:2: 15:17 (#0),
},
Ident {
ident: "struct",
span: $DIR/attribute-after-derive.rs:18:1: 18:7 (#0),
span: $DIR/attribute-after-derive.rs:16:1: 16:7 (#0),
},
Ident {
ident: "AttributeDerive",
span: $DIR/attribute-after-derive.rs:18:8: 18:23 (#0),
span: $DIR/attribute-after-derive.rs:16:8: 16:23 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/attribute-after-derive.rs:19:5: 19:6 (#0),
span: $DIR/attribute-after-derive.rs:17:5: 17:6 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
span: $DIR/attribute-after-derive.rs:19:7: 19:10 (#0),
span: $DIR/attribute-after-derive.rs:17:7: 17:10 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
span: $DIR/attribute-after-derive.rs:19:11: 19:16 (#0),
span: $DIR/attribute-after-derive.rs:17:11: 17:16 (#0),
},
],
span: $DIR/attribute-after-derive.rs:19:10: 19:17 (#0),
span: $DIR/attribute-after-derive.rs:17:10: 17:17 (#0),
},
],
span: $DIR/attribute-after-derive.rs:19:6: 19:18 (#0),
span: $DIR/attribute-after-derive.rs:17:6: 17:18 (#0),
},
Ident {
ident: "field",
span: $DIR/attribute-after-derive.rs:20:5: 20:10 (#0),
span: $DIR/attribute-after-derive.rs:18:5: 18:10 (#0),
},
Punct {
ch: ':',
spacing: Alone,
span: $DIR/attribute-after-derive.rs:20:10: 20:11 (#0),
span: $DIR/attribute-after-derive.rs:18:10: 18:11 (#0),
},
Ident {
ident: "u8",
span: $DIR/attribute-after-derive.rs:20:12: 20:14 (#0),
span: $DIR/attribute-after-derive.rs:18:12: 18:14 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/attribute-after-derive.rs:20:14: 20:15 (#0),
span: $DIR/attribute-after-derive.rs:18:14: 18:15 (#0),
},
],
span: $DIR/attribute-after-derive.rs:18:24: 21:2 (#0),
span: $DIR/attribute-after-derive.rs:16:24: 19:2 (#0),
},
]
PRINT-DERIVE INPUT (DISPLAY): struct AttributeDerive { }
PRINT-DERIVE INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
span: $DIR/attribute-after-derive.rs:18:1: 18:7 (#0),
span: $DIR/attribute-after-derive.rs:16:1: 16:7 (#0),
},
Ident {
ident: "AttributeDerive",
span: $DIR/attribute-after-derive.rs:18:8: 18:23 (#0),
span: $DIR/attribute-after-derive.rs:16:8: 16:23 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [],
span: $DIR/attribute-after-derive.rs:18:24: 21:2 (#0),
span: $DIR/attribute-after-derive.rs:16:24: 19:2 (#0),
},
]
PRINT-DERIVE INPUT (DISPLAY): #[print_attr] struct DeriveAttribute { }
PRINT-DERIVE INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/attribute-after-derive.rs:24:1: 24:2 (#0),
span: $DIR/attribute-after-derive.rs:22:1: 22:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "print_attr",
span: $DIR/attribute-after-derive.rs:24:3: 24:13 (#0),
span: $DIR/attribute-after-derive.rs:22:3: 22:13 (#0),
},
],
span: $DIR/attribute-after-derive.rs:24:2: 24:14 (#0),
span: $DIR/attribute-after-derive.rs:22:2: 22:14 (#0),
},
Ident {
ident: "struct",
span: $DIR/attribute-after-derive.rs:25:1: 25:7 (#0),
span: $DIR/attribute-after-derive.rs:23:1: 23:7 (#0),
},
Ident {
ident: "DeriveAttribute",
span: $DIR/attribute-after-derive.rs:25:8: 25:23 (#0),
span: $DIR/attribute-after-derive.rs:23:8: 23:23 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [],
span: $DIR/attribute-after-derive.rs:25:24: 28:2 (#0),
span: $DIR/attribute-after-derive.rs:23:24: 26:2 (#0),
},
]
PRINT-ATTR INPUT (DISPLAY): struct DeriveAttribute { #[cfg(FALSE)] field : u8, }
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
span: $DIR/attribute-after-derive.rs:25:1: 25:7 (#0),
span: $DIR/attribute-after-derive.rs:23:1: 23:7 (#0),
},
Ident {
ident: "DeriveAttribute",
span: $DIR/attribute-after-derive.rs:25:8: 25:23 (#0),
span: $DIR/attribute-after-derive.rs:23:8: 23:23 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/attribute-after-derive.rs:26:5: 26:6 (#0),
span: $DIR/attribute-after-derive.rs:24:5: 24:6 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
span: $DIR/attribute-after-derive.rs:26:7: 26:10 (#0),
span: $DIR/attribute-after-derive.rs:24:7: 24:10 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
span: $DIR/attribute-after-derive.rs:26:11: 26:16 (#0),
span: $DIR/attribute-after-derive.rs:24:11: 24:16 (#0),
},
],
span: $DIR/attribute-after-derive.rs:26:10: 26:17 (#0),
span: $DIR/attribute-after-derive.rs:24:10: 24:17 (#0),
},
],
span: $DIR/attribute-after-derive.rs:26:6: 26:18 (#0),
span: $DIR/attribute-after-derive.rs:24:6: 24:18 (#0),
},
Ident {
ident: "field",
span: $DIR/attribute-after-derive.rs:27:5: 27:10 (#0),
span: $DIR/attribute-after-derive.rs:25:5: 25:10 (#0),
},
Punct {
ch: ':',
spacing: Alone,
span: $DIR/attribute-after-derive.rs:27:10: 27:11 (#0),
span: $DIR/attribute-after-derive.rs:25:10: 25:11 (#0),
},
Ident {
ident: "u8",
span: $DIR/attribute-after-derive.rs:27:12: 27:14 (#0),
span: $DIR/attribute-after-derive.rs:25:12: 25:14 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/attribute-after-derive.rs:27:14: 27:15 (#0),
span: $DIR/attribute-after-derive.rs:25:14: 25:15 (#0),
},
],
span: $DIR/attribute-after-derive.rs:25:24: 28:2 (#0),
span: $DIR/attribute-after-derive.rs:23:24: 26:2 (#0),
},
]

0 comments on commit 85f0290

Please sign in to comment.