From 6b4ec73b7ed2522b837368a11863afb4b432b9a4 Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Thu, 4 Jul 2019 22:59:28 -0400
Subject: Clippy changes

---
 crates/ra_assists/src/fill_match_arms.rs    | 31 +++++++++++++----------------
 crates/ra_assists/src/split_import.rs       |  5 +----
 crates/ra_db/src/input.rs                   |  3 ++-
 crates/ra_hir/src/code_model.rs             |  6 +++---
 crates/ra_hir/src/ty/infer.rs               |  2 +-
 crates/ra_syntax/src/validation/unescape.rs |  2 +-
 6 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_assists/src/fill_match_arms.rs b/crates/ra_assists/src/fill_match_arms.rs
index d51010b84..deef166b5 100644
--- a/crates/ra_assists/src/fill_match_arms.rs
+++ b/crates/ra_assists/src/fill_match_arms.rs
@@ -23,27 +23,24 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As
     // We already have some match arms, so we don't provide any assists.
     // Unless if there is only one trivial match arm possibly created
     // by match postfix complete. Trivial match arm is the catch all arm.
-    match match_expr.match_arm_list() {
-        Some(arm_list) => {
-            let mut arm_iter = arm_list.arms();
-            let first = arm_iter.next();
-
-            match first {
-                // If there arm list is empty or there is only one trivial arm, then proceed.
-                Some(arm) if is_trivial_arm(arm) => {
-                    if arm_iter.next() != None {
-                        return None;
-                    }
-                }
-                None => {}
-
-                _ => {
+    if let Some(arm_list) = match_expr.match_arm_list() {
+        let mut arm_iter = arm_list.arms();
+        let first = arm_iter.next();
+
+        match first {
+            // If there arm list is empty or there is only one trivial arm, then proceed.
+            Some(arm) if is_trivial_arm(arm) => {
+                if arm_iter.next() != None {
                     return None;
                 }
             }
+            None => {}
+
+            _ => {
+                return None;
+            }
         }
-        _ => {}
-    }
+    };
 
     let expr = match_expr.expr()?;
     let analyzer = hir::SourceAnalyzer::new(ctx.db, ctx.frange.file_id, expr.syntax(), None);
diff --git a/crates/ra_assists/src/split_import.rs b/crates/ra_assists/src/split_import.rs
index a8feb67c8..99088d9a5 100644
--- a/crates/ra_assists/src/split_import.rs
+++ b/crates/ra_assists/src/split_import.rs
@@ -10,10 +10,7 @@ pub(crate) fn split_import(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assis
     let path = ast::Path::cast(colon_colon.parent())?;
     let top_path = successors(Some(path), |it| it.parent_path()).last()?;
 
-    let use_tree = top_path.syntax().ancestors().find_map(ast::UseTree::cast);
-    if use_tree.is_none() {
-        return None;
-    }
+    let _use_tree = top_path.syntax().ancestors().find_map(ast::UseTree::cast)?;
 
     let l_curly = colon_colon.range().end();
     let r_curly = match top_path.syntax().parent().and_then(ast::UseTree::cast) {
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 2d563bd01..ad8e10c52 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -131,7 +131,8 @@ impl CrateGraph {
         if self.dfs_find(from, to, &mut FxHashSet::default()) {
             return Err(CyclicDependencies);
         }
-        Ok(self.arena.get_mut(&from).unwrap().add_dep(name, to))
+        self.arena.get_mut(&from).unwrap().add_dep(name, to);
+        Ok(())
     }
 
     pub fn is_empty(&self) -> bool {
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index ed640d7fc..b3a4f4d63 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -240,10 +240,10 @@ impl Module {
     }
 
     pub fn path_to_root(self, db: &impl HirDatabase) -> Vec<Module> {
-        let mut res = vec![self.clone()];
-        let mut curr = self.clone();
+        let mut res = vec![self];
+        let mut curr = self;
         while let Some(next) = curr.parent(db) {
-            res.push(next.clone());
+            res.push(next);
             curr = next
         }
         res
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index 9228dd314..78aa76449 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -529,7 +529,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 match matching_def {
                     Some(_) => {
                         self.write_assoc_resolution(id, item);
-                        return matching_def;
+                        matching_def
                     }
                     None => None,
                 }
diff --git a/crates/ra_syntax/src/validation/unescape.rs b/crates/ra_syntax/src/validation/unescape.rs
index 1cb2433f3..7eed6c663 100644
--- a/crates/ra_syntax/src/validation/unescape.rs
+++ b/crates/ra_syntax/src/validation/unescape.rs
@@ -262,7 +262,7 @@ where
 
 fn byte_from_char(c: char) -> u8 {
     let res = c as u32;
-    assert!(res <= u8::max_value() as u32, "guaranteed because of Mode::Byte");
+    assert!(res <= u32::from(u8::max_value()), "guaranteed because of Mode::Byte");
     res as u8
 }
 
-- 
cgit v1.2.3