From f704fcb41da636aa0366ac5a6f74af531bc39234 Mon Sep 17 00:00:00 2001 From: Joe Taber Date: Sat, 11 Nov 2023 13:33:19 -0600 Subject: [PATCH] Fix formatting issues --- src/codegen.rs | 12 ++++++------ src/debray_allocator.rs | 10 +++++----- src/forms.rs | 2 -- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/codegen.rs b/src/codegen.rs index 21fd4e4d..7297b72c 100644 --- a/src/codegen.rs +++ b/src/codegen.rs @@ -296,12 +296,12 @@ impl DebrayAllocator { self.mark_var_in_non_callable(var_num, term_loc, vr, code); temp_v!(arg) } else { - match &self.var_data.records[var_num].allocation { - VarAlloc::Perm(_, PermVarAllocation::Pending) => { - self.mark_var_in_non_callable(var_num, term_loc, vr, code); - } - _ => {} - } + match &self.var_data.records[var_num].allocation { + VarAlloc::Perm(_, PermVarAllocation::Pending) => { + self.mark_var_in_non_callable(var_num, term_loc, vr, code); + } + _ => {} + } self.increment_running_count(var_num); RegType::Perm(p) diff --git a/src/debray_allocator.rs b/src/debray_allocator.rs index 30bb0a24..593e584a 100644 --- a/src/debray_allocator.rs +++ b/src/debray_allocator.rs @@ -166,12 +166,12 @@ impl DebrayAllocator { for var_num in subsumed_hits { match &mut self.var_data.records[var_num].allocation { VarAlloc::Perm(_, ref mut allocation) => { - if let PermVarAllocation::Done { + if let PermVarAllocation::Done { shallow_safety, deep_safety, .. } = allocation - { + { if !self .branch_stack .safety_unneeded_in_branch(shallow_safety, &branch_designator) @@ -188,7 +188,7 @@ impl DebrayAllocator { branch_occurrences.deep_safety.insert(var_num); } } - + *allocation = PermVarAllocation::Pending; } _ => unreachable!(), @@ -470,7 +470,7 @@ impl DebrayAllocator { #[inline(always)] pub fn get_binding(&self, var_num: usize) -> RegType { - self.var_data.records[var_num].allocation.as_reg_type() + self.var_data.records[var_num].allocation.as_reg_type() } pub fn num_perm_vars(&self) -> usize { @@ -748,7 +748,7 @@ impl Allocator for DebrayAllocator { } RegType::Perm(0) => { let p = self.alloc_perm_var(var_num, term_loc.chunk_num()); - cell.set(VarReg::Norm(RegType::Perm(p))); + cell.set(VarReg::Norm(RegType::Perm(p))); (RegType::Perm(p), true) } r @ RegType::Perm(_) => { diff --git a/src/forms.rs b/src/forms.rs index d905571f..a42dda7f 100644 --- a/src/forms.rs +++ b/src/forms.rs @@ -885,8 +885,6 @@ pub(crate) struct PredicateInfo { pub(crate) has_clauses: bool, } - - impl PredicateInfo { #[inline] pub(crate) fn compile_incrementally(&self) -> bool { -- 2.54.0