Fix merge conflicts

zorp-corp · Oct 4, 2023 · 79ab07a · 79ab07a
2 parents 771a4fb + 5c5a238
commit 79ab07a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/rust/ares/src/noun.rs b/rust/ares/src/noun.rs
@@ -1105,11 +1105,13 @@ impl private::RawSlots for Noun {
     fn raw_slot(&self, axis: &BitSlice<u64, Lsb0>) -> Result<Noun> {
         match self.as_either_atom_cell() {
             Right(cell) => cell.raw_slot(axis),
-            Left(_atom) => if axis.last_one() == 0 {
-                Ok(self)
-            } else {
-                // Axis tried to descend through atom
-                Err(Error::NotCell)
+            Left(_atom) => {
+                if axis.last_one() == Some(0) {
+                    Ok(*self)
+                } else {
+                    // Axis tried to descend through atom
+                    Err(Error::NotCell)
+                }
             }
         }
     }