Skip to content

Commit 11ac984

Browse files
committed
Fixing issue with prefix_zipper that was causing failures in ACT tests
1 parent 031b30b commit 11ac984

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/prefix_zipper.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,8 @@ impl<'prefix, Z> ZipperMoving for PrefixZipper<'prefix, Z>
359359
fn descend_indexed_byte(&mut self, child_idx: usize) -> Option<u8> {
360360
let mask = self.child_mask();
361361
let byte = mask.indexed_bit::<true>(child_idx)?;
362-
debug_assert!(self.descend_to_byte(byte));
362+
let descended = self.descend_to_byte(byte);
363+
debug_assert!(descended);
363364
Some(byte)
364365
}
365366

src/zipper.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3505,10 +3505,11 @@ pub(crate) mod zipper_moving_tests {
35053505
pub const ZIPPER_INDEXED_MOVEMENT_TEST1_KEYS: &[&[u8]] = &[b"arrow", b"bow", b"cannon", b"romane", b"romanus", b"romulus", b"rubens", b"ruber", b"rubicon", b"rubicundus", b"rom'i"];
35063506

35073507
pub fn indexed_zipper_movement1<Z: ZipperMoving + ZipperPath>(mut zipper: Z) {
3508-
//descends a single specific byte using `descend_indexed_byte`. Just for testing. A real user would use `descend_towards`
3508+
//descends a single specific byte using `descend_indexed_byte`. Just for testing. A real user would use `descend_to` or `descend_to_byte`
35093509
fn descend_byte<Z: Zipper + ZipperMoving + ZipperPath>(zipper: &mut Z, byte: u8) {
35103510
for i in 0..zipper.child_count() {
3511-
assert!(zipper.descend_indexed_byte(i).is_some());
3511+
let descended = zipper.descend_indexed_byte(i);
3512+
assert!(descended.is_some());
35123513
if *zipper.path().last().unwrap() == byte {
35133514
break
35143515
} else {

0 commit comments

Comments
 (0)