Merge pull request #13 from ljedrz/minor_improvements

A few readability and performance improvements

Author: frankmcsherry

src/join.rs

@@ -38,15 +38,12 @@ pub fn antijoin_into<Key: Ord, Val: Ord, Result: Ord>(
     output: &Variable<Result>,
     mut logic: impl FnMut(&Key, &Val)->Result) {
 
-    let mut results = Vec::new();
     let mut tuples2 = &input2[..];
 
-    for &(ref key, ref val) in input1.recent.borrow().iter() {
+    let results = input1.recent.borrow().iter().filter(|(ref key, _)| {
         tuples2 = gallop(tuples2, |k| k < key);
-        if tuples2.first() != Some(key) {
-            results.push(logic(key, val));
-        }
-    }
+        tuples2.first() != Some(key)
+    }).map(|(ref key, ref val)| logic(key, val)).collect::<Vec<_>>();
 
     output.insert(Relation::from_vec(results));
 }
@@ -91,7 +88,7 @@ fn join_helper<K: Ord, V1, V2>(
 
 pub fn gallop<T>(mut slice: &[T], mut cmp: impl FnMut(&T)->bool) -> &[T] {
     // if empty slice, or already >= element, return
-    if slice.len() > 0 && cmp(&slice[0]) {
+    if !slice.is_empty() && cmp(&slice[0]) {
         let mut step = 1;
         while step < slice.len() && cmp(&slice[step]) {
             slice = &slice[step..];
@@ -110,4 +107,4 @@ pub fn gallop<T>(mut slice: &[T], mut cmp: impl FnMut(&T)->bool) -> &[T] {
     }
 
     return slice;
-}
+}

src/lib.rs

@@ -36,10 +36,11 @@ impl<Tuple: Ord> Relation<Tuple> {
         let mut elements2 = other.elements;
 
         // If one of the element lists is zero-length, we don't need to do any work
-        if elements1.len() == 0 {
+        if elements1.is_empty() {
             return Relation { elements: elements2 };
         }
-        if elements2.len() == 0 {
+
+        if elements2.is_empty() {
             return Relation { elements: elements1 };
         }
 
@@ -61,7 +62,7 @@ impl<Tuple: Ord> Relation<Tuple> {
         let mut elements2 = elements2.drain(..).peekable();
 
         elements.push(elements1.next().unwrap());
-        if &elements[0] == elements2.peek().unwrap() {
+        if elements.first() == elements2.peek() {
             elements2.next();
         }
 
@@ -76,9 +77,7 @@ impl<Tuple: Ord> Relation<Tuple> {
         }
 
         // Finish draining second list
-        for elem in elements2 {
-            elements.push(elem);
-        }
+        elements.extend(elements2);
 
         Relation { elements }
     }