From c899e421d7bb55345ee7641d5bdaa211dfe9ca57 Mon Sep 17 00:00:00 2001 From: Joey Beauvais-Feisthauer <joeybf@wayne.edu> Date: Wed, 8 Jun 2022 05:27:28 -0400 Subject: [PATCH] Fix nightly lints --- ext/crates/algebra/src/algebra/adem_algebra.rs | 6 +++--- ext/crates/algebra/src/module/free_module.rs | 4 ++-- ext/crates/algebra/src/module/hom_module.rs | 4 ++-- ext/crates/once/src/lib.rs | 3 ++- ext/src/chain_complex/finite_chain_complex.rs | 2 +- ext/src/secondary.rs | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ext/crates/algebra/src/algebra/adem_algebra.rs b/ext/crates/algebra/src/algebra/adem_algebra.rs index 809907afb..06d6bed31 100644 --- a/ext/crates/algebra/src/algebra/adem_algebra.rs +++ b/ext/crates/algebra/src/algebra/adem_algebra.rs @@ -28,7 +28,7 @@ pub trait AdemAlgebraT: Send + Sync + Algebra { impl AdemAlgebraT for AdemAlgebra { fn adem_algebra(&self) -> &AdemAlgebra { - &*self + self } } @@ -367,7 +367,7 @@ impl GeneratedAlgebra for AdemAlgebra { ps: vec![degree as u32 / (2 * p - 2)], p_or_sq: *self.prime() != 2, }); - return vec![idx]; + vec![idx] } else { // I guess we're assuming here that not generic ==> p == 2. There's probably tons of places we assume that though. if degree.count_ones() != 1 { @@ -379,7 +379,7 @@ impl GeneratedAlgebra for AdemAlgebra { ps: vec![degree as u32], p_or_sq: *self.prime() != 2, }); - return vec![idx]; + vec![idx] } } diff --git a/ext/crates/algebra/src/module/free_module.rs b/ext/crates/algebra/src/module/free_module.rs index 6cecd240d..5cdaced09 100644 --- a/ext/crates/algebra/src/module/free_module.rs +++ b/ext/crates/algebra/src/module/free_module.rs @@ -130,10 +130,10 @@ impl<const U: bool, A: MuAlgebra<U>> Module for MuFreeModule<U, A> { } else { op_str.push(' '); } - return format!( + format!( "{}{}", op_str, self.gen_names[opgen.generator_degree][opgen.generator_index] - ); + ) } fn act_on_basis( diff --git a/ext/crates/algebra/src/module/hom_module.rs b/ext/crates/algebra/src/module/hom_module.rs index 42f4d00c5..9e6aa944f 100644 --- a/ext/crates/algebra/src/module/hom_module.rs +++ b/ext/crates/algebra/src/module/hom_module.rs @@ -110,11 +110,11 @@ impl<M: Module> Module for HomModule<M> { .operation_generator_to_index(0, 0, gen_deg, gen_idx); let basis_deg = gen_deg - degree; let basis_idx = gen_basis_elt.basis_index; - return format!( + format!( "{}*⊗{}", self.source.basis_element_to_string(gen_deg, gen_mod_idx), self.target.basis_element_to_string(basis_deg, basis_idx), - ); + ) } } diff --git a/ext/crates/once/src/lib.rs b/ext/crates/once/src/lib.rs index 49307eabe..80280aa4b 100644 --- a/ext/crates/once/src/lib.rs +++ b/ext/crates/once/src/lib.rs @@ -169,7 +169,8 @@ impl<T> Drop for OnceVec<T> { // but if we can acquire the lock we want to drop the elements inside. If the lock is // poisoned, then we are probably panicking so we don't care about memory leakage. if let Ok(ooo) = self.ooo.lock() { - for entry in ooo.0.iter() { + let ooo_iter = ooo.0.iter(); + for entry in ooo_iter { std::ptr::drop_in_place(self.entry_ptr(*entry)); } } diff --git a/ext/src/chain_complex/finite_chain_complex.rs b/ext/src/chain_complex/finite_chain_complex.rs index 391e601f4..1b74394cf 100644 --- a/ext/src/chain_complex/finite_chain_complex.rs +++ b/ext/src/chain_complex/finite_chain_complex.rs @@ -83,7 +83,7 @@ impl<M: Module> FiniteChainComplex<M, FullModuleHomomorphism<M>> { &self, mut f: impl FnMut(&M) -> N, ) -> FiniteChainComplex<N, FullModuleHomomorphism<N>> { - let modules: Vec<Arc<N>> = self.modules.iter().map(|m| Arc::new(f(&*m))).collect(); + let modules: Vec<Arc<N>> = self.modules.iter().map(|m| Arc::new(f(m))).collect(); let zero_module = Arc::new(f(&*self.zero_module)); let differentials: Vec<_> = self .differentials diff --git a/ext/src/secondary.rs b/ext/src/secondary.rs index 268039a3e..d45da1e18 100644 --- a/ext/src/secondary.rs +++ b/ext/src/secondary.rs @@ -261,7 +261,7 @@ impl<A: PairAlgebra + Send + Sync> SecondaryHomotopy<A> { let timer = Timer::start(); for (coef, d1, d0) in &maps { - composite.add_composite(*coef, t, idx, &*d1, &*d0); + composite.add_composite(*coef, t, idx, d1, d0); } composite.finalize();