Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stabilize built-in attribute macro #[cfg_eval] #87221

Closed
wants to merge 1 commit into from
Closed

Stabilize built-in attribute macro #[cfg_eval] #87221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions library/core/src/macros/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,11 +1461,7 @@ pub(crate) mod builtin {
}

/// Expands all `#[cfg]` and `#[cfg_attr]` attributes in the code fragment it's applied to.
#[unstable(
feature = "cfg_eval",
issue = "82679",
reason = "`cfg_eval` is a recently implemented feature"
)]
#[stable(feature = "cfg_eval", since = "1.55.0")]
#[rustc_builtin_macro]
pub macro cfg_eval($($tt:tt)*) {
/* compiler built-in */
Expand Down
6 changes: 1 addition & 5 deletions library/core/src/prelude/v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ pub use crate::macros::builtin::derive;
#[doc(no_inline)]
pub use crate::macros::builtin::cfg_accessible;

#[unstable(
feature = "cfg_eval",
issue = "82679",
reason = "`cfg_eval` is a recently implemented feature"
)]
#[stable(feature = "cfg_eval", since = "1.55.0")]
#[doc(no_inline)]
pub use crate::macros::builtin::cfg_eval;
1 change: 0 additions & 1 deletion library/std/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@
#![feature(box_syntax)]
#![feature(c_variadic)]
#![feature(cfg_accessible)]
#![feature(cfg_eval)]
#![feature(cfg_target_has_atomic)]
#![feature(cfg_target_thread_local)]
#![feature(char_error_internals)]
Expand Down
6 changes: 1 addition & 5 deletions library/std/src/prelude/v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,7 @@ pub use core::prelude::v1::derive;
#[doc(hidden)]
pub use core::prelude::v1::cfg_accessible;

#[unstable(
feature = "cfg_eval",
issue = "82679",
reason = "`cfg_eval` is a recently implemented feature"
)]
#[stable(feature = "cfg_eval", since = "1.55.0")]
#[doc(hidden)]
pub use core::prelude::v1::cfg_eval;

Expand Down
1 change: 0 additions & 1 deletion src/test/ui/proc-macro/cfg-eval-fail.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![feature(cfg_eval)]
#![feature(stmt_expr_attributes)]

fn main() {
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/proc-macro/cfg-eval-fail.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
error: removing an expression is not supported in this position
--> $DIR/cfg-eval-fail.rs:5:25
--> $DIR/cfg-eval-fail.rs:4:25
|
LL | let _ = #[cfg_eval] #[cfg(FALSE)] 0;
| ^^^^^^^^^^^^^

error: removing an expression is not supported in this position
--> $DIR/cfg-eval-fail.rs:5:25
--> $DIR/cfg-eval-fail.rs:4:25
|
LL | let _ = #[cfg_eval] #[cfg(FALSE)] 0;
| ^^^^^^^^^^^^^

error: removing an expression is not supported in this position
--> $DIR/cfg-eval-fail.rs:5:25
--> $DIR/cfg-eval-fail.rs:4:25
|
LL | let _ = #[cfg_eval] #[cfg(FALSE)] 0;
| ^^^^^^^^^^^^^
Expand Down
1 change: 0 additions & 1 deletion src/test/ui/proc-macro/cfg-eval-inner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// aux-build:test-macros.rs
// check-pass

#![feature(cfg_eval)]
#![feature(custom_inner_attributes)]
#![feature(stmt_expr_attributes)]
#![feature(rustc_attrs)]
Expand Down
96 changes: 48 additions & 48 deletions src/test/ui/proc-macro/cfg-eval-inner.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,241 +7,241 @@ PRINT-ATTR INPUT (DISPLAY): impl Foo <
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "impl",
span: $DIR/cfg-eval-inner.rs:18:1: 18:5 (#0),
span: $DIR/cfg-eval-inner.rs:17:1: 17:5 (#0),
},
Ident {
ident: "Foo",
span: $DIR/cfg-eval-inner.rs:18:6: 18:9 (#0),
span: $DIR/cfg-eval-inner.rs:17:6: 17:9 (#0),
},
Punct {
ch: '<',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:18:9: 18:10 (#0),
span: $DIR/cfg-eval-inner.rs:17:9: 17:10 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "u8",
span: $DIR/cfg-eval-inner.rs:18:11: 18:13 (#0),
span: $DIR/cfg-eval-inner.rs:17:11: 17:13 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:18:13: 18:14 (#0),
span: $DIR/cfg-eval-inner.rs:17:13: 17:14 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:19:5: 19:6 (#0),
span: $DIR/cfg-eval-inner.rs:18:5: 18:6 (#0),
},
Punct {
ch: '!',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:19:6: 19:7 (#0),
span: $DIR/cfg-eval-inner.rs:18:6: 18:7 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "rustc_dummy",
span: $DIR/cfg-eval-inner.rs:19:29: 19:40 (#0),
span: $DIR/cfg-eval-inner.rs:18:29: 18:40 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "cursed_inner",
span: $DIR/cfg-eval-inner.rs:19:41: 19:53 (#0),
span: $DIR/cfg-eval-inner.rs:18:41: 18:53 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:19:40: 19:54 (#0),
span: $DIR/cfg-eval-inner.rs:18:40: 18:54 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:19:5: 19:6 (#0),
span: $DIR/cfg-eval-inner.rs:18:5: 18:6 (#0),
},
Punct {
ch: '#',
spacing: Joint,
span: $DIR/cfg-eval-inner.rs:20:5: 20:6 (#0),
span: $DIR/cfg-eval-inner.rs:19:5: 19:6 (#0),
},
Punct {
ch: '!',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:20:6: 20:7 (#0),
span: $DIR/cfg-eval-inner.rs:19:6: 19:7 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "allow",
span: $DIR/cfg-eval-inner.rs:20:8: 20:13 (#0),
span: $DIR/cfg-eval-inner.rs:19:8: 19:13 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "unused",
span: $DIR/cfg-eval-inner.rs:20:14: 20:20 (#0),
span: $DIR/cfg-eval-inner.rs:19:14: 19:20 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:20:13: 20:21 (#0),
span: $DIR/cfg-eval-inner.rs:19:13: 19:21 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:20:7: 20:22 (#0),
span: $DIR/cfg-eval-inner.rs:19:7: 19:22 (#0),
},
Ident {
ident: "struct",
span: $DIR/cfg-eval-inner.rs:21:5: 21:11 (#0),
span: $DIR/cfg-eval-inner.rs:20:5: 20:11 (#0),
},
Ident {
ident: "Inner",
span: $DIR/cfg-eval-inner.rs:21:12: 21:17 (#0),
span: $DIR/cfg-eval-inner.rs:20:12: 20:17 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [
Ident {
ident: "field",
span: $DIR/cfg-eval-inner.rs:22:9: 22:14 (#0),
span: $DIR/cfg-eval-inner.rs:21:9: 21:14 (#0),
},
Punct {
ch: ':',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:22:14: 22:15 (#0),
span: $DIR/cfg-eval-inner.rs:21:14: 21:15 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "u8",
span: $DIR/cfg-eval-inner.rs:22:17: 22:19 (#0),
span: $DIR/cfg-eval-inner.rs:21:17: 21:19 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:22:19: 22:20 (#0),
span: $DIR/cfg-eval-inner.rs:21:19: 21:20 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:23:13: 23:14 (#0),
span: $DIR/cfg-eval-inner.rs:22:13: 22:14 (#0),
},
Punct {
ch: '!',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:23:14: 23:15 (#0),
span: $DIR/cfg-eval-inner.rs:22:14: 22:15 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "rustc_dummy",
span: $DIR/cfg-eval-inner.rs:23:37: 23:48 (#0),
span: $DIR/cfg-eval-inner.rs:22:37: 22:48 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "another_cursed_inner",
span: $DIR/cfg-eval-inner.rs:23:49: 23:69 (#0),
span: $DIR/cfg-eval-inner.rs:22:49: 22:69 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:23:48: 23:70 (#0),
span: $DIR/cfg-eval-inner.rs:22:48: 22:70 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:23:13: 23:14 (#0),
span: $DIR/cfg-eval-inner.rs:22:13: 22:14 (#0),
},
Literal {
kind: Integer,
symbol: "1",
suffix: None,
span: $DIR/cfg-eval-inner.rs:24:13: 24:14 (#0),
span: $DIR/cfg-eval-inner.rs:23:13: 23:14 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:22:21: 25:10 (#0),
span: $DIR/cfg-eval-inner.rs:21:21: 24:10 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:22:16: 25:11 (#0),
span: $DIR/cfg-eval-inner.rs:21:16: 24:11 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:21:18: 26:6 (#0),
span: $DIR/cfg-eval-inner.rs:20:18: 25:6 (#0),
},
Literal {
kind: Integer,
symbol: "0",
suffix: None,
span: $DIR/cfg-eval-inner.rs:28:5: 28:6 (#0),
span: $DIR/cfg-eval-inner.rs:27:5: 27:6 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:18:15: 29:2 (#0),
span: $DIR/cfg-eval-inner.rs:17:15: 28:2 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:18:10: 29:3 (#0),
span: $DIR/cfg-eval-inner.rs:17:10: 28:3 (#0),
},
Punct {
ch: '>',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:29:3: 29:4 (#0),
span: $DIR/cfg-eval-inner.rs:28:3: 28:4 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:32:5: 32:6 (#0),
span: $DIR/cfg-eval-inner.rs:31:5: 31:6 (#0),
},
Punct {
ch: '!',
spacing: Alone,
span: $DIR/cfg-eval-inner.rs:32:6: 32:7 (#0),
span: $DIR/cfg-eval-inner.rs:31:6: 31:7 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "rustc_dummy",
span: $DIR/cfg-eval-inner.rs:32:29: 32:40 (#0),
span: $DIR/cfg-eval-inner.rs:31:29: 31:40 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "evaluated_attr",
span: $DIR/cfg-eval-inner.rs:32:41: 32:55 (#0),
span: $DIR/cfg-eval-inner.rs:31:41: 31:55 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:32:40: 32:56 (#0),
span: $DIR/cfg-eval-inner.rs:31:40: 31:56 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:32:5: 32:6 (#0),
span: $DIR/cfg-eval-inner.rs:31:5: 31:6 (#0),
},
Ident {
ident: "fn",
span: $DIR/cfg-eval-inner.rs:34:5: 34:7 (#0),
span: $DIR/cfg-eval-inner.rs:33:5: 33:7 (#0),
},
Ident {
ident: "bar",
span: $DIR/cfg-eval-inner.rs:34:8: 34:11 (#0),
span: $DIR/cfg-eval-inner.rs:33:8: 33:11 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [],
span: $DIR/cfg-eval-inner.rs:34:11: 34:13 (#0),
span: $DIR/cfg-eval-inner.rs:33:11: 33:13 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [],
span: $DIR/cfg-eval-inner.rs:34:14: 36:6 (#0),
span: $DIR/cfg-eval-inner.rs:33:14: 35:6 (#0),
},
],
span: $DIR/cfg-eval-inner.rs:29:5: 37:2 (#0),
span: $DIR/cfg-eval-inner.rs:28:5: 36:2 (#0),
},
]
1 change: 0 additions & 1 deletion src/test/ui/proc-macro/cfg-eval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// compile-flags: -Z span-debug
// aux-build:test-macros.rs

#![feature(cfg_eval)]
#![feature(proc_macro_hygiene)]
#![feature(stmt_expr_attributes)]
#![feature(rustc_attrs)]
Expand Down