diff options
-rw-r--r-- | Cargo.lock | 8 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/quote.rs | 6 | ||||
-rw-r--r-- | crates/ra_mbe/Cargo.toml | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1dedf9772..d7ec266c0 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -1135,7 +1135,7 @@ dependencies = [ | |||
1135 | "ra_syntax 0.1.0", | 1135 | "ra_syntax 0.1.0", |
1136 | "ra_tt 0.1.0", | 1136 | "ra_tt 0.1.0", |
1137 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1137 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1138 | "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", | 1138 | "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1139 | "test_utils 0.1.0", | 1139 | "test_utils 0.1.0", |
1140 | ] | 1140 | ] |
1141 | 1141 | ||
@@ -1604,6 +1604,11 @@ dependencies = [ | |||
1604 | ] | 1604 | ] |
1605 | 1605 | ||
1606 | [[package]] | 1606 | [[package]] |
1607 | name = "smallvec" | ||
1608 | version = "1.0.0" | ||
1609 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1610 | |||
1611 | [[package]] | ||
1607 | name = "smol_str" | 1612 | name = "smol_str" |
1608 | version = "0.1.15" | 1613 | version = "0.1.15" |
1609 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1614 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -2007,6 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
2007 | "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" | 2012 | "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" |
2008 | "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" | 2013 | "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" |
2009 | "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" | 2014 | "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" |
2015 | "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" | ||
2010 | "checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b" | 2016 | "checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b" |
2011 | "checksum stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d96fc4f13a0ac088e9a3cd9af1cc8c5cc1ab5deb2145cef661267dfc9c542f8a" | 2017 | "checksum stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d96fc4f13a0ac088e9a3cd9af1cc8c5cc1ab5deb2145cef661267dfc9c542f8a" |
2012 | "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" | 2018 | "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" |
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 | ||
diff --git a/crates/ra_mbe/Cargo.toml b/crates/ra_mbe/Cargo.toml index e8ef2457b..b02e45ee3 100644 --- a/crates/ra_mbe/Cargo.toml +++ b/crates/ra_mbe/Cargo.toml | |||
@@ -9,7 +9,7 @@ ra_syntax = { path = "../ra_syntax" } | |||
9 | ra_parser = { path = "../ra_parser" } | 9 | ra_parser = { path = "../ra_parser" } |
10 | tt = { path = "../ra_tt", package = "ra_tt" } | 10 | tt = { path = "../ra_tt", package = "ra_tt" } |
11 | rustc-hash = "1.0.0" | 11 | rustc-hash = "1.0.0" |
12 | smallvec = "0.6.9" | 12 | smallvec = "1.0.0" |
13 | log = "0.4.5" | 13 | log = "0.4.5" |
14 | 14 | ||
15 | [dev-dependencies] | 15 | [dev-dependencies] |