Skip to content

Commit 5ae38bb

Browse files
petrochenkovpetrochenkov
committed
Stabilize proc macros in type positions
1 parent 349259d commit 5ae38bb

File tree

8 files changed

+23
-27
lines changed

8 files changed

+23
-27
lines changed

‎src/librustc_macros/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![feature(proc_macro_hygiene)]
21
#![allow(rustc::default_hash_types)]
32

43
#![recursion_limit="128"]

‎src/libsyntax/ext/expand.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -749,14 +749,14 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
749749

750750
fn gate_proc_macro_expansion_kind(&self, span: Span, kind: AstFragmentKind) {
751751
let kind = match kind {
752-
AstFragmentKind::Expr => "expressions",
752+
AstFragmentKind::Expr |
753753
AstFragmentKind::OptExpr => "expressions",
754754
AstFragmentKind::Pat => "patterns",
755-
AstFragmentKind::Ty => "types",
756755
AstFragmentKind::Stmts => "statements",
757-
AstFragmentKind::Items => return,
758-
AstFragmentKind::TraitItems => return,
759-
AstFragmentKind::ImplItems => return,
756+
AstFragmentKind::Ty |
757+
AstFragmentKind::Items |
758+
AstFragmentKind::TraitItems |
759+
AstFragmentKind::ImplItems |
760760
AstFragmentKind::ForeignItems => return,
761761
AstFragmentKind::Arms
762762
| AstFragmentKind::Fields

‎src/test/ui/proc-macro/dollar-crate-issue-62325.rs

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// normalize-stdout-test "bytes\([^0]\w*\.\.(\w+)\)" -> "bytes(LO..$1)"
88
// normalize-stdout-test "bytes\((\w+)\.\.[^0]\w*\)" -> "bytes($1..HI)"
99

10-
#![feature(proc_macro_hygiene)]
11-
1210
#[macro_use]
1311
extern crate test_macros;
1412
extern crate dollar_crate_external;

‎src/test/ui/proc-macro/lifetimes.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// aux-build:lifetimes.rs
22

3-
#![feature(proc_macro_hygiene)]
4-
53
extern crate lifetimes;
64

75
use lifetimes::*;

‎src/test/ui/proc-macro/lifetimes.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected type, found `'`
2-
--> $DIR/lifetimes.rs:9:10
2+
--> $DIR/lifetimes.rs:7:10
33
|
44
LL | type A = single_quote_alone!();
55
| ^^^^^^^^^^^^^^^^^^^^^ this macro call doesn't expand to a type

‎src/test/ui/proc-macro/macros-in-type.rs

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// check-pass
2+
// aux-build:test-macros.rs
3+
4+
#[macro_use]
5+
extern crate test_macros;
6+
7+
const C: identity!(u8) = 10;
8+
9+
fn main() {
10+
let c: u8 = C;
11+
}

‎src/test/ui/proc-macro/proc-macro-gates.rs

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ fn attrs() {
5050
}
5151

5252
fn main() {
53-
let _x: identity!(u32) = 3; //~ ERROR: procedural macros cannot be expanded to types
5453
if let identity!(Some(_x)) = Some(3) {}
5554
//~^ ERROR: procedural macros cannot be expanded to patterns
5655

‎src/test/ui/proc-macro/proc-macro-gates.stderr

+6-15
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,8 @@ LL | let _x = #[identity_attr] println!();
9494
= note: for more information, see https://github.com/rust-lang/rust/issues/54727
9595
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
9696

97-
error[E0658]: procedural macros cannot be expanded to types
98-
--> $DIR/proc-macro-gates.rs:53:13
99-
|
100-
LL | let _x: identity!(u32) = 3;
101-
| ^^^^^^^^^^^^^^
102-
|
103-
= note: for more information, see https://github.com/rust-lang/rust/issues/54727
104-
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
105-
10697
error[E0658]: procedural macros cannot be expanded to patterns
107-
--> $DIR/proc-macro-gates.rs:54:12
98+
--> $DIR/proc-macro-gates.rs:53:12
10899
|
109100
LL | if let identity!(Some(_x)) = Some(3) {}
110101
| ^^^^^^^^^^^^^^^^^^^
@@ -113,7 +104,7 @@ LL | if let identity!(Some(_x)) = Some(3) {}
113104
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
114105

115106
error[E0658]: procedural macros cannot be expanded to statements
116-
--> $DIR/proc-macro-gates.rs:57:5
107+
--> $DIR/proc-macro-gates.rs:56:5
117108
|
118109
LL | empty!(struct S;);
119110
| ^^^^^^^^^^^^^^^^^^
@@ -122,7 +113,7 @@ LL | empty!(struct S;);
122113
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
123114

124115
error[E0658]: procedural macros cannot be expanded to statements
125-
--> $DIR/proc-macro-gates.rs:58:5
116+
--> $DIR/proc-macro-gates.rs:57:5
126117
|
127118
LL | empty!(let _x = 3;);
128119
| ^^^^^^^^^^^^^^^^^^^^
@@ -131,7 +122,7 @@ LL | empty!(let _x = 3;);
131122
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
132123

133124
error[E0658]: procedural macros cannot be expanded to expressions
134-
--> $DIR/proc-macro-gates.rs:60:14
125+
--> $DIR/proc-macro-gates.rs:59:14
135126
|
136127
LL | let _x = identity!(3);
137128
| ^^^^^^^^^^^^
@@ -140,14 +131,14 @@ LL | let _x = identity!(3);
140131
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
141132

142133
error[E0658]: procedural macros cannot be expanded to expressions
143-
--> $DIR/proc-macro-gates.rs:61:15
134+
--> $DIR/proc-macro-gates.rs:60:15
144135
|
145136
LL | let _x = [empty!(3)];
146137
| ^^^^^^^^^
147138
|
148139
= note: for more information, see https://github.com/rust-lang/rust/issues/54727
149140
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
150141

151-
error: aborting due to 17 previous errors
142+
error: aborting due to 16 previous errors
152143

153144
For more information about this error, try `rustc --explain E0658`.

0 commit comments

Comments
 (0)