Skip to content

Commit 8da80cc

Browse files
Merge pull request #11 from bevyengine/collect
prefer collect into Vec
2 parents e71b195 + e170e02 commit 8da80cc

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

src/lib.rs

+27-26
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ impl Parse for AllTuples {
163163
pub fn all_tuples(input: TokenStream) -> TokenStream {
164164
let input = parse_macro_input!(input as AllTuples);
165165
let len = 1 + input.end - input.start;
166-
let mut ident_tuples = Vec::with_capacity(len);
167-
for i in 0..=len {
168-
let idents = input
169-
.idents
170-
.iter()
171-
.map(|ident| format_ident!("{}{}", ident, i));
172-
ident_tuples.push(to_ident_tuple(idents, input.idents.len()));
173-
}
174-
166+
let ident_tuples = (0..=len)
167+
.map(|i| {
168+
let idents = input
169+
.idents
170+
.iter()
171+
.map(|ident| format_ident!("{}{}", ident, i));
172+
to_ident_tuple(idents, input.idents.len())
173+
})
174+
.collect::<Vec<_>>();
175175
let macro_ident = &input.macro_ident;
176176
let invocations = (input.start..=input.end).map(|i| {
177177
let ident_tuples = choose_ident_tuples(&input, &ident_tuples, i);
@@ -238,15 +238,15 @@ pub fn all_tuples(input: TokenStream) -> TokenStream {
238238
pub fn all_tuples_enumerated(input: TokenStream) -> TokenStream {
239239
let input = parse_macro_input!(input as AllTuples);
240240
let len = 1 + input.end - input.start;
241-
let mut ident_tuples = Vec::with_capacity(len);
242-
for i in 0..=len {
243-
let idents = input
244-
.idents
245-
.iter()
246-
.map(|ident| format_ident!("{}{}", ident, i));
247-
ident_tuples.push(to_ident_tuple_enumerated(idents, i));
248-
}
249-
241+
let ident_tuples = (0..=len)
242+
.map(|i| {
243+
let idents = input
244+
.idents
245+
.iter()
246+
.map(|ident| format_ident!("{}{}", ident, i));
247+
to_ident_tuple_enumerated(idents, input.idents.len())
248+
})
249+
.collect::<Vec<_>>();
250250
let macro_ident = &input.macro_ident;
251251
let invocations = (input.start..=input.end).map(|i| {
252252
let ident_tuples = choose_ident_tuples_enumerated(&input, &ident_tuples, i);
@@ -380,14 +380,15 @@ pub fn all_tuples_enumerated(input: TokenStream) -> TokenStream {
380380
pub fn all_tuples_with_size(input: TokenStream) -> TokenStream {
381381
let input = parse_macro_input!(input as AllTuples);
382382
let len = 1 + input.end - input.start;
383-
let mut ident_tuples = Vec::with_capacity(len);
384-
for i in 0..=len {
385-
let idents = input
386-
.idents
387-
.iter()
388-
.map(|ident| format_ident!("{}{}", ident, i));
389-
ident_tuples.push(to_ident_tuple(idents, input.idents.len()));
390-
}
383+
let ident_tuples = (0..=len)
384+
.map(|i| {
385+
let idents = input
386+
.idents
387+
.iter()
388+
.map(|ident| format_ident!("{}{}", ident, i));
389+
to_ident_tuple(idents, input.idents.len())
390+
})
391+
.collect::<Vec<_>>();
391392
let macro_ident = &input.macro_ident;
392393
let invocations = (input.start..=input.end).map(|i| {
393394
let ident_tuples = choose_ident_tuples(&input, &ident_tuples, i);

0 commit comments

Comments
 (0)