diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-15 13:03:46 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-15 13:03:46 +0000 |
commit | c6f05abfbbfa2fd1ff06e1adeea7885151aaa768 (patch) | |
tree | c9c1cf36c97933eb8e74c0da9f6c4601f89590d2 /crates/ra_hir_expand | |
parent | 04f1bd17cbedfdc89b1061376dabd52aa94cb4a9 (diff) | |
parent | a5f57f98ca4c0afb1c292da6676a1273ce95f0e0 (diff) |
Merge #2259
2259: Update smallvec and fix rustc warning r=matklad a=memoryruins
- Update smallvec in ra_mbe to [1.0](https://github.com/servo/rust-smallvec/releases/tag/v1.0.0)
- Heed rustc's `array_into_iter` lint https://github.com/rust-lang/rust/issues/66145
Co-authored-by: memoryruins <[email protected]>
Diffstat (limited to 'crates/ra_hir_expand')
-rw-r--r-- | crates/ra_hir_expand/src/quote.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_hir_expand/src/quote.rs b/crates/ra_hir_expand/src/quote.rs index 9cd17f0e3..35133d216 100644 --- a/crates/ra_hir_expand/src/quote.rs +++ b/crates/ra_hir_expand/src/quote.rs | |||
@@ -241,10 +241,8 @@ mod tests { | |||
241 | // } | 241 | // } |
242 | let struct_name = mk_ident("Foo"); | 242 | let struct_name = mk_ident("Foo"); |
243 | let fields = [mk_ident("name"), mk_ident("id")]; | 243 | let fields = [mk_ident("name"), mk_ident("id")]; |
244 | let fields = fields | 244 | let fields = |
245 | .into_iter() | 245 | fields.iter().map(|it| quote!(#it: self.#it.clone(), ).token_trees.clone()).flatten(); |
246 | .map(|it| quote!(#it: self.#it.clone(), ).token_trees.clone()) | ||
247 | .flatten(); | ||
248 | 246 | ||
249 | let list = tt::Subtree { delimiter: tt::Delimiter::Brace, token_trees: fields.collect() }; | 247 | let list = tt::Subtree { delimiter: tt::Delimiter::Brace, token_trees: fields.collect() }; |
250 | 248 | ||