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 rust-lang/rust#66145 Co-authored-by: memoryruins <[email protected]>
rust-lang · Nov 15, 2019 · c6f05ab · c6f05ab
2 parents 04f1bd1 + a5f57f9
commit c6f05ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ra_hir_expand/src/quote.rs b/crates/ra_hir_expand/src/quote.rs
@@ -241,10 +241,8 @@ mod tests {
         // }
         let struct_name = mk_ident("Foo");
         let fields = [mk_ident("name"), mk_ident("id")];
-        let fields = fields
-            .into_iter()
-            .map(|it| quote!(#it: self.#it.clone(), ).token_trees.clone())
-            .flatten();
+        let fields =
+            fields.iter().map(|it| quote!(#it: self.#it.clone(), ).token_trees.clone()).flatten();
 
         let list = tt::Subtree { delimiter: tt::Delimiter::Brace, token_trees: fields.collect() };
 

diff --git a/crates/ra_mbe/Cargo.toml b/crates/ra_mbe/Cargo.toml
@@ -9,7 +9,7 @@ ra_syntax = { path = "../ra_syntax" }
 ra_parser = { path = "../ra_parser" }
 tt = { path = "../ra_tt", package = "ra_tt" }
 rustc-hash = "1.0.0"
-smallvec = "0.6.9"
+smallvec = "1.0.0"
 log = "0.4.5"
 
 [dev-dependencies]