From: Mark Thom Date: Sat, 1 Mar 2025 21:58:50 +0000 (-0800) Subject: run cargo fmt X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=21bd2e523fad417083f659c12e6e8ef0710beeed;p=scryer-prolog.git run cargo fmt --- diff --git a/src/heap_iter.rs b/src/heap_iter.rs index fd9b1b0c..2b0e44c1 100644 --- a/src/heap_iter.rs +++ b/src/heap_iter.rs @@ -2220,10 +2220,16 @@ mod tests { assert_eq!(iter.next(), None); } - assert_eq!(wam.machine_st.heap.slice_to_str(0, "a string".len()), "a string"); - assert_eq!(wam.machine_st.heap[1], HeapCellValue::build_with(HeapCellValueTag::Cons, 0)); + assert_eq!( + wam.machine_st.heap.slice_to_str(0, "a string".len()), + "a string" + ); + assert_eq!( + wam.machine_st.heap[1], + HeapCellValue::build_with(HeapCellValueTag::Cons, 0) + ); - for idx in 2 ..= 3 { + for idx in 2..=3 { assert!(!wam.machine_st.heap[idx].get_mark_bit()); assert!(!wam.machine_st.heap[idx].get_forwarding_bit()); } @@ -2970,7 +2976,6 @@ mod tests { assert_eq!(wam.machine_st.heap[4], heap_loc_as_cell!(0)); wam.machine_st.heap.clear(); - } #[test] diff --git a/src/lib.rs b/src/lib.rs index ffd532f7..1926c7df 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,6 @@ #![recursion_limit = "4112"] #![deny(missing_docs)] - #[macro_use] extern crate static_assertions; diff --git a/src/machine/gc.rs b/src/machine/gc.rs index b18b5300..cb46f861 100644 --- a/src/machine/gc.rs +++ b/src/machine/gc.rs @@ -130,7 +130,7 @@ impl PStrLocValuesMap { } fn progress_pstr_marking(&mut self, heap_slice: &[u8], pstr_loc: usize) -> usize { - match self.hit_set.range(..= pstr_loc).next_back() { + match self.hit_set.range(..=pstr_loc).next_back() { Some((_prev_pstr_loc, &tail_idx)) if pstr_loc < heap_index!(tail_idx) => { return tail_idx; } @@ -142,7 +142,10 @@ impl PStrLocValuesMap { None => heap_slice.len(), }; - match heap_slice[pstr_loc..delimiter].iter().position(|b| *b == 0u8) { + match heap_slice[pstr_loc..delimiter] + .iter() + .position(|b| *b == 0u8) + { Some(zero_byte_offset) => { let tail_idx = if (zero_byte_offset + 1) % Heap::heap_cell_alignment() == 0 { cell_index!(pstr_loc + zero_byte_offset) + 2 @@ -354,7 +357,8 @@ impl<'a, UMP: UnmarkPolicy> StacklessPreOrderHeapIter<'a, UMP> { .pstr_loc_values .progress_pstr_marking(self.heap.as_slice(), pstr_loc); - self.pstr_loc_values.insert_pstr_loc_value(self.current, pstr_loc); + self.pstr_loc_values + .insert_pstr_loc_value(self.current, pstr_loc); if self.heap[tail_idx].get_forwarding_bit() { return Some(self.backward_and_return()); @@ -379,10 +383,18 @@ impl<'a, UMP: UnmarkPolicy> StacklessPreOrderHeapIter<'a, UMP> { } } HeapCellValueTag::Cons => { - match self.pstr_loc_values.hit_set.range(.. heap_index!(self.current + 1)).next_back() { + match self + .pstr_loc_values + .hit_set + .range(..heap_index!(self.current + 1)) + .next_back() + { Some((_prev_pstr_loc, &tail_idx)) if self.current + 1 == tail_idx => { let pstr_loc_loc = self.heap[self.current].get_value() as usize; - let pstr_loc_val = self.pstr_loc_values.pstr_loc_loc_value(pstr_loc_loc).unwrap(); + let pstr_loc_val = self + .pstr_loc_values + .pstr_loc_loc_value(pstr_loc_loc) + .unwrap(); self.heap[self.current].set_value(self.next); diff --git a/src/machine/mock_wam.rs b/src/machine/mock_wam.rs index 71f74f0c..32c4cf59 100644 --- a/src/machine/mock_wam.rs +++ b/src/machine/mock_wam.rs @@ -439,14 +439,23 @@ mod tests { assert!(!wam.fail); - assert_eq!(wam.heap.slice_to_str(heap_index!(0), "this is a string".len()), - "this is a string"); + assert_eq!( + wam.heap + .slice_to_str(heap_index!(0), "this is a string".len()), + "this is a string" + ); assert_eq!(wam.heap[3], pstr_loc_as_cell!(heap_index!(8))); - assert_eq!(wam.heap.slice_to_str(heap_index!(4), "this is a string".len()), - "this is a string"); + assert_eq!( + wam.heap + .slice_to_str(heap_index!(4), "this is a string".len()), + "this is a string" + ); assert_eq!(wam.heap[7], pstr_loc_as_cell!(heap_index!(8))); - assert_eq!(wam.heap.slice_to_str(heap_index!(8), "this is a string".len()), - "this is a string"); + assert_eq!( + wam.heap + .slice_to_str(heap_index!(8), "this is a string".len()), + "this is a string" + ); assert_eq!(wam.heap[11], pstr_loc_as_cell!(heap_index!(8))); wam.heap.clear();