Merge pull request #20 from segeljakt/rust-dev

Minor changes

Author: scotts

rust/src/lib.rs

@@ -2,7 +2,7 @@ use alga::general::Operator;
 use std::ops::Range;
 
 /// An abstract data type which maintains a time-ordered sliding window.
-pub trait TimeWindow<Time, Value, BinOp>
+pub trait TimeWindow<Time, Value, BinOp>: Clone
 where
     Time: Ord,
     BinOp: Operator,
@@ -18,7 +18,7 @@ where
 }
 
 /// An abstract data type which maintains a fifo-ordered sliding window.
-pub trait FifoWindow<Value, BinOp>
+pub trait FifoWindow<Value, BinOp>: Clone
 where
     BinOp: Operator,
 {

rust/src/reactive/flat_fat.rs

@@ -2,7 +2,7 @@ use alga::general::AbstractMonoid;
 use alga::general::Operator;
 use std::collections::HashSet;
 
-pub(crate) trait FAT<Value, BinOp>
+pub(crate) trait FAT<Value, BinOp>: Clone
 where
     Value: AbstractMonoid<BinOp> + Clone,
     BinOp: Operator,
@@ -33,6 +33,7 @@ where
     fn suffix(&self, i: usize) -> Value;
 }
 
+#[derive(Clone)]
 pub(crate) struct FlatFAT<Value, BinOp>
 where
     Value: AbstractMonoid<BinOp> + Clone,
@@ -141,7 +142,7 @@ where
             let leaf = self.leaf(idx);
             self.tree[leaf] = val;
         });
-        (0..self.leaf(0)).into_iter().rev().for_each(|parent| {
+        (0..self.leaf(0)).rev().for_each(|parent| {
             let left = self.left(parent);
             let right = self.right(parent);
             self.tree[parent] = self.tree[left].operate(&self.tree[right]);
@@ -163,7 +164,7 @@ where
             }
             node = parent;
         }
-        return agg;
+        agg
     }
 
     fn suffix(&self, i: usize) -> Value {
@@ -176,6 +177,6 @@ where
             }
             node = parent;
         }
-        return agg;
+        agg
     }
 }

rust/src/reactive/mod.rs

@@ -5,6 +5,7 @@ use crate::FifoWindow;
 use alga::general::AbstractMonoid;
 use alga::general::Operator;
 
+#[derive(Clone)]
 pub struct Reactive<Value, BinOp>
 where
     Value: AbstractMonoid<BinOp> + Clone,
@@ -31,7 +32,7 @@ where
         }
     }
     fn inverted(&self) -> bool {
-        return self.front > self.back;
+        self.front > self.back
     }
     fn resize(&mut self, capacity: usize) {
         let leaves = self.fat.leaves();

rust/src/recalc/mod.rs

@@ -1,10 +1,10 @@
 use crate::FifoWindow;
 use alga::general::AbstractMonoid;
 use alga::general::Operator;
-use std::marker::PhantomData;
 use std::collections::VecDeque;
+use std::marker::PhantomData;
 
-#[derive(Debug)]
+#[derive(Clone)]
 pub struct ReCalc<Value, BinOp>
 where
     Value: AbstractMonoid<BinOp> + Clone,
@@ -19,8 +19,8 @@ where
     Value: AbstractMonoid<BinOp> + Clone,
     BinOp: Operator,
 {
-    fn new() -> ReCalc<Value, BinOp> {
-        ReCalc {
+    fn new() -> Self {
+        Self {
             stack: VecDeque::new(),
             op: PhantomData,
         }

rust/src/soe/mod.rs

@@ -4,7 +4,7 @@ use alga::general::Operator;
 use std::collections::VecDeque;
 use std::marker::PhantomData;
 
-#[derive(Debug)]
+#[derive(Clone)]
 pub struct SoE<Value, BinOp>
 where
     Value: AbstractGroup<BinOp> + Clone,
@@ -20,8 +20,8 @@ where
     Value: AbstractGroup<BinOp> + Clone,
     BinOp: Operator,
 {
-    fn new() -> SoE<Value, BinOp> {
-        SoE {
+    fn new() -> Self {
+        Self {
             stack: VecDeque::new(),
             agg: Value::identity(),
             op: PhantomData,

rust/src/two_stacks/mod.rs

@@ -3,7 +3,7 @@ use alga::general::AbstractMonoid;
 use alga::general::Operator;
 use std::marker::PhantomData;
 
-#[derive(Debug)]
+#[derive(Clone)]
 struct Item<Value>
 where
     Value: Clone,
@@ -12,7 +12,7 @@ where
     val: Value,
 }
 
-#[derive(Debug)]
+#[derive(Clone)]
 pub struct TwoStacks<Value, BinOp>
 where
     Value: AbstractMonoid<BinOp> + Clone,
@@ -28,8 +28,8 @@ where
     Value: AbstractMonoid<BinOp> + Clone,
     BinOp: Operator,
 {
-    fn new() -> TwoStacks<Value, BinOp> {
-        TwoStacks {
+    fn new() -> Self {
+        Self {
             front: Vec::new(),
             back: Vec::new(),
             op: PhantomData,
@@ -63,7 +63,7 @@ where
     BinOp: Operator,
 {
     #[inline(always)]
-    fn agg(stack: &Vec<Item<Value>>) -> Value {
+    fn agg(stack: &[Item<Value>]) -> Value {
         if let Some(top) = stack.last() {
             top.agg.clone()
         } else {