Merge #3220

3220: Fix clippy warnings, update Cargo.toml versions r=matklad a=SomeoneToIgnore

In the `cargo xtask lint` ouptut, there were two interesting Clippy warnings that might be interesting to investigate further:

* warning: this argument (4 byte) is passed by reference, but would be more efficient if passed by value (limit: 8 byte)

* warning: large size difference between variants

Co-authored-by: Kirill Bulatov <[email protected]>

4 files changed, 11 insertions, 16 deletions

diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/ra_hir_expand/Cargo.toml
index 3ae4376dc..d6e3c1f76 100644
--- a/crates/ra_hir_expand/Cargo.toml
+++ b/crates/ra_hir_expand/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["rust-analyzer developers"]
 doctest = false
 
 [dependencies]
-log = "0.4.5"
-either = "1.5"
+log = "0.4.8"
+either = "1.5.3"
 
 ra_arena = { path = "../ra_arena" }
 ra_db = { path = "../ra_db" }
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs
index 62c60e336..d0e3eaf7e 100644
--- a/crates/ra_hir_expand/src/builtin_derive.rs
+++ b/crates/ra_hir_expand/src/builtin_derive.rs
@@ -235,7 +235,7 @@ mod tests {
         let (db, file_id) = TestDB::with_single_file(&s);
         let parsed = db.parse(file_id);
         let items: Vec<_> =
-            parsed.syntax_node().descendants().filter_map(|it| ast::ModuleItem::cast(it)).collect();
+            parsed.syntax_node().descendants().filter_map(ast::ModuleItem::cast).collect();
 
         let ast_id_map = db.ast_id_map(file_id.into());
 
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index f3f959ac6..f2bb0bddb 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -155,14 +155,11 @@ fn compile_error_expand(
     tt: &tt::Subtree,
 ) -> Result<tt::Subtree, mbe::ExpandError> {
     if tt.count() == 1 {
-        match &tt.token_trees[0] {
-            tt::TokenTree::Leaf(tt::Leaf::Literal(it)) => {
-                let s = it.text.as_str();
-                if s.contains(r#"""#) {
-                    return Ok(quote! { loop { #it }});
-                }
+        if let tt::TokenTree::Leaf(tt::Leaf::Literal(it)) = &tt.token_trees[0] {
+            let s = it.text.as_str();
+            if s.contains('"') {
+                return Ok(quote! { loop { #it }});
             }
-            _ => {}
         };
     }
 
@@ -222,7 +219,7 @@ mod tests {
         let (db, file_id) = TestDB::with_single_file(&s);
         let parsed = db.parse(file_id);
         let macro_calls: Vec<_> =
-            parsed.syntax_node().descendants().filter_map(|it| ast::MacroCall::cast(it)).collect();
+            parsed.syntax_node().descendants().filter_map(ast::MacroCall::cast).collect();
 
         let ast_id_map = db.ast_id_map(file_id.into());
 
diff --git a/crates/ra_hir_expand/src/quote.rs b/crates/ra_hir_expand/src/quote.rs
index 4de219ce4..57e7eebf9 100644
--- a/crates/ra_hir_expand/src/quote.rs
+++ b/crates/ra_hir_expand/src/quote.rs
@@ -15,14 +15,13 @@ macro_rules! __quote {
     ( @SUBTREE $delim:ident $($tt:tt)* ) => {
         {
             let children = $crate::__quote!($($tt)*);
-            let subtree = tt::Subtree {
+            tt::Subtree {
                 delimiter: Some(tt::Delimiter {
                     kind: tt::DelimiterKind::$delim,
                     id: tt::TokenId::unspecified(),
                 }),
                 token_trees: $crate::quote::IntoTt::to_tokens(children),
-            };
-            subtree
+            }
         }
     };
 
@@ -259,8 +258,7 @@ mod tests {
         // }
         let struct_name = mk_ident("Foo");
         let fields = [mk_ident("name"), mk_ident("id")];
-        let fields =
-            fields.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).flatten();
 
         let list = tt::Subtree {
             delimiter: Some(tt::Delimiter {