Skip to content

Commit

Permalink
Merge #2259
Browse files Browse the repository at this point in the history
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 <memoryruinsmusic@gmail.com>
  • Loading branch information
bors[bot] and memoryruins committed Nov 15, 2019
2 parents 04f1bd1 + a5f57f9 commit c6f05ab
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
8 changes: 7 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions crates/ra_hir_expand/src/quote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() };

Expand Down
2 changes: 1 addition & 1 deletion crates/ra_mbe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit c6f05ab

Please sign in to comment.