fixed some clippy warnings

Author: erismart

src/bin/graspan1.rs

@@ -16,11 +16,11 @@ fn main() {
     let filename = std::env::args().nth(1).unwrap();
     let file = BufReader::new(File::open(filename).unwrap());
     for readline in file.lines() {
-        let line = readline.ok().expect("read error");
-        if !line.starts_with('#') && line.len() > 0 {
+        let line = readline.expect("read error");
+        if !line.is_empty() && !line.starts_with('#') {
             let mut elts = line[..].split_whitespace();
-            let src: u32 = elts.next().unwrap().parse().ok().expect("malformed src");
-            let dst: u32 = elts.next().unwrap().parse().ok().expect("malformed dst");
+            let src: u32 = elts.next().unwrap().parse().expect("malformed src");
+            let dst: u32 = elts.next().unwrap().parse().expect("malformed dst");
             let typ: &str = elts.next().unwrap();
             match typ {
                 "n" => { nodes.push((dst, src)); },
@@ -53,4 +53,4 @@ fn main() {
 
     println!("{:?}\tComputation complete (nodes_final: {})", timer.elapsed(), reachable.len());
 
-}
+}

src/join.rs

@@ -70,8 +70,8 @@ fn join_helper<K: Ord, V1, V2>(
 
                 // Produce results from the cross-product of matches.
                 for index1 in 0 .. count1 {
-                    for index2 in 0 .. count2 {
-                        result(&slice1[0].0, &slice1[index1].1, &slice2[index2].1);
+                    for s2 in slice2[..count2].iter() {
+                        result(&slice1[0].0, &slice1[index1].1, &s2.1);
                     }
                 }
 
@@ -92,19 +92,19 @@ pub fn gallop<T>(mut slice: &[T], mut cmp: impl FnMut(&T)->bool) -> &[T] {
         let mut step = 1;
         while step < slice.len() && cmp(&slice[step]) {
             slice = &slice[step..];
-            step = step << 1;
+            step <<= 1;
         }
 
-        step = step >> 1;
+        step >>= 1;
         while step > 0 {
             if step < slice.len() && cmp(&slice[step]) {
                 slice = &slice[step..];
             }
-            step = step >> 1;
+            step >>= 1;
         }
 
         slice = &slice[1..]; // advance one, as we always stayed < value
     }
 
-    return slice;
+    slice
 }

src/lib.rs

@@ -296,9 +296,9 @@ impl<Tuple: Ord> Variable<Tuple> {
         Variable {
             distinct: true,
             name: name.to_string(),
-            stable: Rc::new(RefCell::new(Vec::new().into())),
+            stable: Rc::new(RefCell::new(Vec::new())),
             recent: Rc::new(RefCell::new(Vec::new().into())),
-            to_add: Rc::new(RefCell::new(Vec::new().into())),
+            to_add: Rc::new(RefCell::new(Vec::new())),
         }
     }
     /// Inserts a relation into the variable.
@@ -356,15 +356,15 @@ impl<Tuple: Ord> VariableTrait for Variable<Tuple> {
                     if slice.len() > 4 * to_add.elements.len() {
                         to_add.elements.retain(|x| {
                             slice = join::gallop(slice, |y| y < x);
-                            slice.len() == 0 || &slice[0] != x
+                            slice.is_empty() || &slice[0] != x
                         });
                     }
                     else {
                         to_add.elements.retain(|x| {
-                            while slice.len() > 0 && &slice[0] < x {
+                            while !slice.is_empty() && &slice[0] < x {
                                 slice = &slice[1..];
                             }
-                            slice.len() == 0 || &slice[0] != x
+                            slice.is_empty() || &slice[0] != x
                         });
                     }
                 }