Merge #1212

1212: Clippy cleanups r=matklad a=kjeremy



Co-authored-by: kjeremy <[email protected]>

Author: bors[bot]

crates/ra_arena/src/lib.rs

@@ -71,12 +71,15 @@ impl<ID: ArenaId, T> Arena<ID, T> {
     pub fn len(&self) -> usize {
         self.data.len()
     }
+    pub fn is_empty(&self) -> bool {
+        self.data.is_empty()
+    }
     pub fn alloc(&mut self, value: T) -> ID {
         let id = RawId(self.data.len() as u32);
         self.data.push(value);
         ID::from_raw(id)
     }
-    pub fn iter<'a>(&'a self) -> impl Iterator<Item = (ID, &'a T)> {
+    pub fn iter(&self) -> impl Iterator<Item = (ID, &T)> {
         self.data.iter().enumerate().map(|(idx, value)| (ID::from_raw(RawId(idx as u32)), value))
     }
 }

crates/ra_parser/src/grammar/expressions.rs

@@ -252,12 +252,12 @@ fn expr_bp(
     // `newly_dollar_open` is a flag indicated that dollar is just closed after lhs, e.g.
     // `$1$ + a`
     // We use this flag to skip handling it.
-    let mut newly_dollar_open = false;
-
-    if p.at_l_dollar() {
+    let mut newly_dollar_open = if p.at_l_dollar() {
         *dollar_lvl += p.eat_l_dollars();
-        newly_dollar_open = true;
-    }
+        true
+    } else {
+        false
+    };
 
     let mut lhs = match lhs(p, r, dollar_lvl) {
         Some((lhs, blocklike)) => {
@@ -535,7 +535,7 @@ fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, BlockLike) {
         }
         EXCL => {
             let block_like = items::macro_call_after_excl(p);
-            return (m.complete(p, MACRO_CALL), block_like);
+            (m.complete(p, MACRO_CALL), block_like)
         }
         _ => (m.complete(p, PATH_EXPR), BlockLike::NotBlock),
     }

crates/ra_prof/src/lib.rs

@@ -67,14 +67,11 @@ pub fn profile(desc: &str) -> Profiler {
 
     PROFILE_STACK.with(|stack| {
         let mut stack = stack.borrow_mut();
-        if stack.starts.len() == 0 {
-            match FILTER.try_read() {
-                Ok(f) => {
-                    if f.version > stack.filter_data.version {
-                        stack.filter_data = f.clone();
-                    }
+        if stack.starts.is_empty() {
+            if let Ok(f) = FILTER.try_read() {
+                if f.version > stack.filter_data.version {
+                    stack.filter_data = f.clone();
                 }
-                Err(_) => (),
             };
         }
 
@@ -107,23 +104,23 @@ impl Filter {
     // env RA_PROFILE=foo|bar|baz   // enabled only selected entries
     // env RA_PROFILE=*@3>10        // dump everything, up to depth 3, if it takes more than 10 ms
     pub fn from_spec(mut spec: &str) -> Filter {
-        let longer_than = if let Some(idx) = spec.rfind(">") {
+        let longer_than = if let Some(idx) = spec.rfind('>') {
             let longer_than = spec[idx + 1..].parse().expect("invalid profile longer_than");
             spec = &spec[..idx];
             Duration::from_millis(longer_than)
         } else {
             Duration::new(0, 0)
         };
 
-        let depth = if let Some(idx) = spec.rfind("@") {
+        let depth = if let Some(idx) = spec.rfind('@') {
             let depth: usize = spec[idx + 1..].parse().expect("invalid profile depth");
             spec = &spec[..idx];
             depth
         } else {
             999
         };
         let allowed =
-            if spec == "*" { Vec::new() } else { spec.split("|").map(String::from).collect() };
+            if spec == "*" { Vec::new() } else { spec.split('|').map(String::from).collect() };
         Filter::new(depth, allowed, longer_than)
     }