tweaks

HigherOrderCO · Mar 25, 2024 · 695b402 · 695b402
1 parent de3d1fc
commit 695b402
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/run/linker.rs b/src/run/linker.rs
@@ -371,8 +371,8 @@ impl RedexQueue {
     self.fast.is_empty() && self.slow.is_empty()
   }
   #[inline(always)]
-  pub fn take(&mut self) -> impl Iterator<Item = (Port, Port)> {
-    std::mem::take(&mut self.fast).into_iter().chain(std::mem::take(&mut self.slow))
+  pub fn drain(&mut self) -> impl Iterator<Item = (Port, Port)> + '_ {
+    self.fast.drain(..).chain(self.slow.drain(..))
   }
   #[inline(always)]
   pub fn iter(&self) -> impl Iterator<Item = &(Port, Port)> {
@@ -392,7 +392,6 @@ impl RedexQueue {
 // Returns whether a redex does not allocate memory
 fn redex_would_shrink(a: &Port, b: &Port) -> bool {
   (*a == Port::ERA || *b == Port::ERA)
-    || (!(a.tag() == Tag::Ref || b.tag() == Tag::Ref)
-      && (((a.tag() == Tag::Ctr && b.tag() == Tag::Ctr) || a.lab() == b.lab())
-        || (a.tag() == Tag::Num || b.tag() == Tag::Num)))
+    || (a.tag() == Tag::Ctr && b.tag() == Tag::Ctr && a.lab() == b.lab())
+    || (!(a.tag() == Tag::Ref || b.tag() == Tag::Ref) && (a.tag() == Tag::Num || b.tag() == Tag::Num))
 }
diff --git a/src/run/parallel.rs b/src/run/parallel.rs
@@ -4,7 +4,7 @@ impl<'h, M: Mode> Net<'h, M> {
   /// Forks the net into `tids` child nets, for parallel operation.
   pub fn fork(&mut self, tids: usize) -> impl Iterator<Item = Self> + '_ {
     let redexes_len = self.redexes.len();
-    let mut redexes = self.redexes.take();
+    let mut redexes = self.redexes.drain();
     (0 .. tids).map(move |tid| {
       let heap_size = (self.heap.0.len() / tids) & !63; // round down to needed alignment
       let heap_start = heap_size * tid;
@@ -71,7 +71,6 @@ impl<'h, M: Mode> Net<'h, M> {
       }
     });
 
-    // Clear redexes and sum stats
     delta.add_to(&mut self.rwts);
 
     // Main reduction loop