Merge #8063

8063: couple clippy::complexity fixes r=matklad a=matthiaskrgr

avoid redundant `.into()` calls to convert T into identical T (`let x: String = String::from("hello").into();`)
use `if let Some(x)` instead of `.is_some()` + `.unwrap()`
don't clone Copy types
remove redundant wrapped ?s:  `Some(Some(3)?)` can just be `Some(3)`
use `.map(|x| y)` instead of `and_then(|x| Some(y)` on `Option`s

Co-authored-by: Matthias Krüger <[email protected]>

1 files changed, 9 insertions, 12 deletions

diff --git a/crates/mbe/src/benchmark.rs b/crates/mbe/src/benchmark.rs
index 503ad1355..ba814a2e1 100644
--- a/crates/mbe/src/benchmark.rs
+++ b/crates/mbe/src/benchmark.rs
@@ -120,7 +120,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt
                 Some("pat") => parent.token_trees.push(make_ident("foo")),
                 Some("path") => parent.token_trees.push(make_ident("foo")),
                 Some("literal") => parent.token_trees.push(make_literal("1")),
-                Some("expr") => parent.token_trees.push(make_ident("foo").into()),
+                Some("expr") => parent.token_trees.push(make_ident("foo")),
                 Some("lifetime") => {
                     parent.token_trees.push(make_punct('\''));
                     parent.token_trees.push(make_ident("a"));
@@ -157,17 +157,15 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt
                     if i + 1 != cnt {
                         if let Some(sep) = separator {
                             match sep {
-                                Separator::Literal(it) => parent
-                                    .token_trees
-                                    .push(tt::Leaf::Literal(it.clone().into()).into()),
-                                Separator::Ident(it) => parent
-                                    .token_trees
-                                    .push(tt::Leaf::Ident(it.clone().into()).into()),
+                                Separator::Literal(it) => {
+                                    parent.token_trees.push(tt::Leaf::Literal(it.clone()).into())
+                                }
+                                Separator::Ident(it) => {
+                                    parent.token_trees.push(tt::Leaf::Ident(it.clone()).into())
+                                }
                                 Separator::Puncts(puncts) => {
                                     for it in puncts {
-                                        parent
-                                            .token_trees
-                                            .push(tt::Leaf::Punct(it.clone().into()).into())
+                                        parent.token_trees.push(tt::Leaf::Punct(*it).into())
                                     }
                                 }
                             };
@@ -176,8 +174,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt
                 }
             }
             Op::Subtree { tokens, delimiter } => {
-                let mut subtree =
-                    tt::Subtree { delimiter: delimiter.clone(), token_trees: Vec::new() };
+                let mut subtree = tt::Subtree { delimiter: *delimiter, token_trees: Vec::new() };
                 tokens.iter().for_each(|it| {
                     collect_from_op(it, &mut subtree, seed);
                 });