Skip to content

Commit d816eba

Browse files
committed
fix new failing proc macro tests
1 parent de1f410 commit d816eba

File tree

1 file changed

+49
-61
lines changed

1 file changed

+49
-61
lines changed

tests/ui/auxiliary/proc_macro_derive.rs

Lines changed: 49 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -90,70 +90,58 @@ pub fn extra_lifetime(_input: TokenStream) -> TokenStream {
9090
#[allow(unused)]
9191
#[proc_macro_derive(ArithmeticDerive)]
9292
pub fn arithmetic_derive(_: TokenStream) -> TokenStream {
93-
<TokenStream as FromIterator<TokenTree>>::from_iter(
94-
[
95-
Ident::new("fn", Span::call_site()).into(),
96-
Ident::new("_foo", Span::call_site()).into(),
97-
Group::new(Delimiter::Parenthesis, TokenStream::new()).into(),
98-
Group::new(
99-
Delimiter::Brace,
100-
<TokenStream as FromIterator<TokenTree>>::from_iter(
101-
[
102-
Ident::new("let", Span::call_site()).into(),
103-
Ident::new("mut", Span::call_site()).into(),
104-
Ident::new("_n", Span::call_site()).into(),
105-
Punct::new('=', Spacing::Alone).into(),
106-
Literal::i32_unsuffixed(9).into(),
107-
Punct::new(';', Spacing::Alone).into(),
108-
Ident::new("_n", Span::call_site()).into(),
109-
Punct::new('=', Spacing::Alone).into(),
110-
Literal::i32_unsuffixed(9).into(),
111-
Punct::new('/', Spacing::Alone).into(),
112-
Literal::i32_unsuffixed(2).into(),
113-
Punct::new(';', Spacing::Alone).into(),
114-
Ident::new("_n", Span::call_site()).into(),
115-
Punct::new('=', Spacing::Alone).into(),
116-
Punct::new('-', Spacing::Alone).into(),
117-
Ident::new("_n", Span::call_site()).into(),
118-
Punct::new(';', Spacing::Alone).into(),
119-
]
120-
.into_iter(),
121-
),
122-
)
123-
.into(),
124-
]
125-
.into_iter(),
126-
)
93+
<TokenStream as FromIterator<TokenTree>>::from_iter([
94+
Ident::new("fn", Span::call_site()).into(),
95+
Ident::new("_foo", Span::call_site()).into(),
96+
Group::new(Delimiter::Parenthesis, TokenStream::new()).into(),
97+
Group::new(
98+
Delimiter::Brace,
99+
<TokenStream as FromIterator<TokenTree>>::from_iter([
100+
Ident::new("let", Span::call_site()).into(),
101+
Ident::new("mut", Span::call_site()).into(),
102+
Ident::new("_n", Span::call_site()).into(),
103+
Punct::new('=', Spacing::Alone).into(),
104+
Literal::i32_unsuffixed(9).into(),
105+
Punct::new(';', Spacing::Alone).into(),
106+
Ident::new("_n", Span::call_site()).into(),
107+
Punct::new('=', Spacing::Alone).into(),
108+
Literal::i32_unsuffixed(9).into(),
109+
Punct::new('/', Spacing::Alone).into(),
110+
Literal::i32_unsuffixed(2).into(),
111+
Punct::new(';', Spacing::Alone).into(),
112+
Ident::new("_n", Span::call_site()).into(),
113+
Punct::new('=', Spacing::Alone).into(),
114+
Punct::new('-', Spacing::Alone).into(),
115+
Ident::new("_n", Span::call_site()).into(),
116+
Punct::new(';', Spacing::Alone).into(),
117+
]),
118+
)
119+
.into(),
120+
])
127121
}
128122

129123
#[allow(unused)]
130124
#[proc_macro_derive(ShadowDerive)]
131125
pub fn shadow_derive(_: TokenStream) -> TokenStream {
132-
<TokenStream as FromIterator<TokenTree>>::from_iter(
133-
[
134-
Ident::new("fn", Span::call_site()).into(),
135-
Ident::new("_foo", Span::call_site()).into(),
136-
Group::new(Delimiter::Parenthesis, TokenStream::new()).into(),
137-
Group::new(
138-
Delimiter::Brace,
139-
<TokenStream as FromIterator<TokenTree>>::from_iter(
140-
[
141-
Ident::new("let", Span::call_site()).into(),
142-
Ident::new("_x", Span::call_site()).into(),
143-
Punct::new('=', Spacing::Alone).into(),
144-
Literal::i32_unsuffixed(2).into(),
145-
Punct::new(';', Spacing::Alone).into(),
146-
Ident::new("let", Span::call_site()).into(),
147-
Ident::new("_x", Span::call_site()).into(),
148-
Punct::new('=', Spacing::Alone).into(),
149-
Ident::new("_x", Span::call_site()).into(),
150-
Punct::new(';', Spacing::Alone).into(),
151-
]
152-
.into_iter(),
153-
),
154-
)
155-
.into(),
156-
]
157-
.into_iter(),
158-
)
126+
<TokenStream as FromIterator<TokenTree>>::from_iter([
127+
Ident::new("fn", Span::call_site()).into(),
128+
Ident::new("_foo", Span::call_site()).into(),
129+
Group::new(Delimiter::Parenthesis, TokenStream::new()).into(),
130+
Group::new(
131+
Delimiter::Brace,
132+
<TokenStream as FromIterator<TokenTree>>::from_iter([
133+
Ident::new("let", Span::call_site()).into(),
134+
Ident::new("_x", Span::call_site()).into(),
135+
Punct::new('=', Spacing::Alone).into(),
136+
Literal::i32_unsuffixed(2).into(),
137+
Punct::new(';', Spacing::Alone).into(),
138+
Ident::new("let", Span::call_site()).into(),
139+
Ident::new("_x", Span::call_site()).into(),
140+
Punct::new('=', Spacing::Alone).into(),
141+
Ident::new("_x", Span::call_site()).into(),
142+
Punct::new(';', Spacing::Alone).into(),
143+
]),
144+
)
145+
.into(),
146+
])
159147
}

0 commit comments

Comments
 (0)