From: Mark Thom Date: Fri, 9 Jan 2026 04:09:12 +0000 (-0800) Subject: cargo fmt fixes X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=1a8c4f9b03dff3301723bc3d8e8877ea5af915b8;p=scryer-prolog.git cargo fmt fixes --- diff --git a/src/debray_allocator.rs b/src/debray_allocator.rs index d214b8c7..30fae204 100644 --- a/src/debray_allocator.rs +++ b/src/debray_allocator.rs @@ -85,9 +85,9 @@ impl BranchStack { ) -> bool { match safety { VarSafetyStatus::Needed => false, - VarSafetyStatus::LocallyUnneeded(planter_branch) => { - planter_branch.branch_num.has_as_subbranch(&branch.branch_num) - } + VarSafetyStatus::LocallyUnneeded(planter_branch) => planter_branch + .branch_num + .has_as_subbranch(&branch.branch_num), VarSafetyStatus::GloballyUnneeded => true, } } @@ -108,9 +108,7 @@ impl BranchStack { .map(|occurrences| occurrences.current_branch_num.clone()) .unwrap_or_else(|| BranchNumber::default()); - BranchDesignator { - branch_num, - } + BranchDesignator { branch_num } } #[inline] diff --git a/src/forms.rs b/src/forms.rs index 65939d58..310228e4 100644 --- a/src/forms.rs +++ b/src/forms.rs @@ -164,9 +164,9 @@ impl PartialOrd for BranchNumber { impl BranchNumber { pub(crate) fn has_as_subbranch(&self, other: &Self) -> bool { - other.delta <= self.delta && - other.branch_num >= self.branch_num && - other.branch_num < &self.branch_num + &self.delta + other.delta <= self.delta + && other.branch_num >= self.branch_num + && other.branch_num < &self.branch_num + &self.delta } pub(crate) fn split(&self) -> BranchNumber { diff --git a/src/machine/disjuncts.rs b/src/machine/disjuncts.rs index 95f4ae5f..09eec4a1 100644 --- a/src/machine/disjuncts.rs +++ b/src/machine/disjuncts.rs @@ -427,7 +427,8 @@ impl VariableClassifier { TraversalState::ResetCallPolicy(call_policy) => { self.call_policy = call_policy; } - TraversalState::BuildDisjunct(preceding_len) | TraversalState::BuildFinalDisjunct(preceding_len) => { + TraversalState::BuildDisjunct(preceding_len) + | TraversalState::BuildFinalDisjunct(preceding_len) => { let branch_num = self.root_set.pop().unwrap(); flatten_into_disjunct(&mut build_stack, branch_num, preceding_len); @@ -566,7 +567,7 @@ impl VariableClassifier { )); let iter = branches.into_iter().zip(branch_numbers.into_iter()); - let final_disjunct_loc = state_stack.len(); + let final_disjunct_loc = state_stack.len(); for (term, branch_num) in iter.rev() { state_stack.push(TraversalState::BuildDisjunct(build_stack_len)); @@ -623,7 +624,7 @@ impl VariableClassifier { build_stack.reserve_branch(2); - state_stack.push(TraversalState::RepBranchNum( + state_stack.push(TraversalState::RepBranchNum( self.current_branch_num.halve_delta(), )); state_stack.push(TraversalState::BuildFinalDisjunct(build_stack_len)); diff --git a/src/machine/machine_state_impl.rs b/src/machine/machine_state_impl.rs index 393b646f..36a4772c 100644 --- a/src/machine/machine_state_impl.rs +++ b/src/machine/machine_state_impl.rs @@ -934,7 +934,10 @@ impl MachineState { } // see 8.4.4.3 of Draft Technical Corrigendum 2 for an error guide. - pub fn key_val_pair(&mut self, value: HeapCellValue) -> Result<(HeapCellValue, HeapCellValue), MachineStub> { + pub fn key_val_pair( + &mut self, + value: HeapCellValue, + ) -> Result<(HeapCellValue, HeapCellValue), MachineStub> { let stub_gen = || functor_stub(atom!("keysort"), 2); let store_v = self.store(self.deref(value));