From 5476c4faa34ae2ec8f736ec21e3965ed8e33c225 Mon Sep 17 00:00:00 2001 From: memoryruins Date: Fri, 15 Nov 2019 06:45:58 -0500 Subject: [PATCH 1/2] Update smallvec dep to 1.0 --- Cargo.lock | 8 +++++++- crates/ra_mbe/Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1dedf9772106..d7ec266c0b3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1135,7 +1135,7 @@ dependencies = [ "ra_syntax 0.1.0", "ra_tt 0.1.0", "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "test_utils 0.1.0", ] @@ -1603,6 +1603,11 @@ dependencies = [ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "smallvec" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "smol_str" version = "0.1.15" @@ -2007,6 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" "checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b" "checksum stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d96fc4f13a0ac088e9a3cd9af1cc8c5cc1ab5deb2145cef661267dfc9c542f8a" "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" diff --git a/crates/ra_mbe/Cargo.toml b/crates/ra_mbe/Cargo.toml index e8ef2457bb9c..b02e45ee39d1 100644 --- 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] From a5f57f98ca4c0afb1c292da6676a1273ce95f0e0 Mon Sep 17 00:00:00 2001 From: memoryruins Date: Fri, 15 Nov 2019 06:53:11 -0500 Subject: [PATCH 2/2] Heed the advice of rustc's into_iter() warning --- crates/ra_hir_expand/src/quote.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/ra_hir_expand/src/quote.rs b/crates/ra_hir_expand/src/quote.rs index 9cd17f0e3545..35133d216493 100644 --- 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() };