minor tweaks.

diff --git a/src/l2/codegen.rs b/src/l2/codegen.rs
index 1b11bf4d2123b3f15236583579af624edfd53c83..7948e40af9006e456163ceecb16fa7e078cace0e 100644 (file)
--- a/src/l2/codegen.rs
+++ b/src/l2/codegen.rs
@@ -239,17 +239,7 @@ impl<'a> TermMarker<'a> {
 
     fn advance_at_header(&mut self, term: &'a Term) {
         self.arg_c = 1;
-        self.temp_c = max(term.subterms(),
-                          self.bindings.values()
-                          .filter_map(|vr| {
-                              match vr {
-                                  &VarReg::Norm(RegType::Temp(reg)) |
-                                  &VarReg::ArgAndNorm(RegType::Temp(reg), _) =>
-                                      Some(reg),
-                                  _ => None
-                              }
-                          })
-                          .max().unwrap_or(0)) + 1;
+        self.temp_c = max(term.subterms(), self.temp_c) + 1;
     }
 
     fn advance(&mut self, term: &'a Term) {

diff --git a/src/l2/machine.rs b/src/l2/machine.rs
index 869950d6956947665646a62f508b3957df5c84bd..8fa6e662e4c596fe0e94d510ed0853774c7941fe 100644 (file)
--- a/src/l2/machine.rs
+++ b/src/l2/machine.rs
@@ -172,8 +172,7 @@ impl Machine {
         }
         
         if succeeded {
-            let result = Some(self.heap_view(heap_locs));
-            result
+            Some(self.heap_view(heap_locs))
         } else {
             None
         }