diff --git a/garble/mpz-garble-core/src/encoding/encoder.rs b/garble/mpz-garble-core/src/encoding/encoder.rs index 2b5e5b18..2677be39 100644 --- a/garble/mpz-garble-core/src/encoding/encoder.rs +++ b/garble/mpz-garble-core/src/encoding/encoder.rs @@ -123,7 +123,6 @@ impl Encoder for ChaChaEncoder { #[cfg(test)] mod test { - use crate::encoding::{state, EncodedValue}; use std::marker::PhantomData; use super::*; diff --git a/garble/mpz-garble-core/src/encoding/value.rs b/garble/mpz-garble-core/src/encoding/value.rs index cc433786..337ebc9f 100644 --- a/garble/mpz-garble-core/src/encoding/value.rs +++ b/garble/mpz-garble-core/src/encoding/value.rs @@ -780,13 +780,12 @@ define_encoding_commitment_variant!(U128Commitment, U128, 128); #[cfg(test)] mod tests { use crate::{ChaChaEncoder, Encoder}; - use mpz_circuits::types::StaticValueType; use std::marker::PhantomData; use rand::{ distributions::{Distribution, Standard}, - Rng, SeedableRng, + SeedableRng, }; use rand_chacha::ChaCha12Rng; use rstest::*; @@ -811,12 +810,10 @@ mod tests { #[case::u32_array(PhantomData::<[u32; 16]>)] #[case::u64_array(PhantomData::<[u64; 16]>)] #[case::u128_array(PhantomData::<[u128; 16]>)] - fn test_encoding( - encoder: ChaChaEncoder, - #[case] _pd: PhantomData, - ) where + fn test_encoding(encoder: ChaChaEncoder, #[case] _pd: PhantomData) + where Standard: Distribution, - T: Into + Copy, + T: StaticValueType + Default + Into + Copy, { let mut rng = ChaCha12Rng::from_seed([0u8; 32]); diff --git a/garble/mpz-garble/src/memory.rs b/garble/mpz-garble/src/memory.rs index 0f380e50..65c7a738 100644 --- a/garble/mpz-garble/src/memory.rs +++ b/garble/mpz-garble/src/memory.rs @@ -452,7 +452,7 @@ mod tests { use super::*; - use mpz_circuits::types::{StaticValueType, ValueType}; + use mpz_circuits::types::StaticValueType; use mpz_garble_core::{encoding_state, ChaChaEncoder, Encoder}; use rstest::*; diff --git a/matrix-transpose/benches/transpose.rs b/matrix-transpose/benches/transpose.rs index 59906e5c..b70bdfbb 100644 --- a/matrix-transpose/benches/transpose.rs +++ b/matrix-transpose/benches/transpose.rs @@ -1,10 +1,7 @@ #![allow(clippy::all)] use criterion::{criterion_group, criterion_main, Criterion}; -use rand::{ - distributions::{Distribution, Standard}, - prelude::*, -}; +use rand::{distributions::Standard, prelude::*}; fn random_vec(elements: usize) -> Vec where diff --git a/matrix-transpose/src/lib.rs b/matrix-transpose/src/lib.rs index 1bdb20d6..0881675c 100644 --- a/matrix-transpose/src/lib.rs +++ b/matrix-transpose/src/lib.rs @@ -75,10 +75,7 @@ pub enum TransposeError { #[cfg(test)] mod tests { use super::*; - use rand::{ - distributions::{Distribution, Standard}, - prelude::*, - }; + use rand::{distributions::Standard, prelude::*}; fn random_vec(elements: usize) -> Vec where @@ -96,7 +93,10 @@ mod tests { let row_count = bits.len(); let mut bits_: Vec> = vec![vec![false; row_count]; col_count]; + + #[allow(clippy::needless_range_loop)] for j in 0..row_count { + #[allow(clippy::needless_range_loop)] for i in 0..col_count { bits_[i][j] = bits[j][i]; } diff --git a/mpz-core/benches/lpn.rs b/mpz-core/benches/lpn.rs index c1a97ce0..73ddf049 100644 --- a/mpz-core/benches/lpn.rs +++ b/mpz-core/benches/lpn.rs @@ -14,6 +14,7 @@ fn criterion_benchmark(c: &mut Criterion) { prg.random_blocks(&mut x); prg.random_blocks(&mut y); bench.iter(|| { + #[allow(clippy::unit_arg)] black_box(lpn.compute(&mut y, &x)); }); }); @@ -29,6 +30,7 @@ fn criterion_benchmark(c: &mut Criterion) { prg.random_blocks(&mut x); prg.random_blocks(&mut y); bench.iter(|| { + #[allow(clippy::unit_arg)] black_box(lpn.compute(&mut y, &x)); }); }); @@ -44,6 +46,7 @@ fn criterion_benchmark(c: &mut Criterion) { prg.random_blocks(&mut x); prg.random_blocks(&mut y); bench.iter(|| { + #[allow(clippy::unit_arg)] black_box(lpn.compute(&mut y, &x)); }); }); diff --git a/mpz-core/src/block.rs b/mpz-core/src/block.rs index a78d3818..fdd3fd60 100644 --- a/mpz-core/src/block.rs +++ b/mpz-core/src/block.rs @@ -7,7 +7,6 @@ use generic_array::{typenum::consts::U16, GenericArray}; use itybity::{BitIterable, BitLength, GetBit, Lsb0, Msb0}; use rand::{distributions::Standard, prelude::Distribution, CryptoRng, Rng}; use serde::{Deserialize, Serialize}; -use std::convert::From; /// A block of 128 bits #[repr(transparent)] diff --git a/ot/mpz-ot-core/src/kos/mod.rs b/ot/mpz-ot-core/src/kos/mod.rs index 42288251..d551ebfc 100644 --- a/ot/mpz-ot-core/src/kos/mod.rs +++ b/ot/mpz-ot-core/src/kos/mod.rs @@ -52,7 +52,6 @@ mod tests { use rand::Rng; use rand_chacha::ChaCha12Rng; - use rand_core::SeedableRng; #[fixture] fn choices() -> Vec { diff --git a/ot/mpz-ot/src/actor/kos/mod.rs b/ot/mpz-ot/src/actor/kos/mod.rs index a9e9eff4..875fe16f 100644 --- a/ot/mpz-ot/src/actor/kos/mod.rs +++ b/ot/mpz-ot/src/actor/kos/mod.rs @@ -42,10 +42,7 @@ mod tests { use msgs::Message; use super::*; - use futures::{ - stream::{SplitSink, SplitStream}, - StreamExt, - }; + use futures::stream::{SplitSink, SplitStream}; use rstest::*; use mpz_core::Block; diff --git a/ot/mpz-ot/src/kos/mod.rs b/ot/mpz-ot/src/kos/mod.rs index d43542fb..ad844027 100644 --- a/ot/mpz-ot/src/kos/mod.rs +++ b/ot/mpz-ot/src/kos/mod.rs @@ -50,7 +50,6 @@ pub(crate) fn into_base_stream<'a, St: IoStream> + Send + Unpin #[cfg(test)] mod tests { use super::*; - use futures_util::StreamExt; use rstest::*; use itybity::ToBits; @@ -59,7 +58,7 @@ mod tests { use rand::Rng; use rand_chacha::ChaCha12Rng; use rand_core::SeedableRng; - use utils_aio::{duplex::MemoryDuplex, sink::IoSink, stream::IoStream}; + use utils_aio::duplex::MemoryDuplex; use crate::{ ideal::{ideal_ot_pair, IdealOTReceiver, IdealOTSender}, diff --git a/share-conversion/mpz-share-conversion-core/src/fields/p256.rs b/share-conversion/mpz-share-conversion-core/src/fields/p256.rs index f5fd009e..5a633dc6 100644 --- a/share-conversion/mpz-share-conversion-core/src/fields/p256.rs +++ b/share-conversion/mpz-share-conversion-core/src/fields/p256.rs @@ -144,9 +144,8 @@ mod tests { use super::*; - use crate::fields::{ - tests::{test_field_basic, test_field_bit_ops, test_field_compute_product_repeated}, - Field, + use crate::fields::tests::{ + test_field_basic, test_field_bit_ops, test_field_compute_product_repeated, }; #[test] diff --git a/share-conversion/mpz-share-conversion/src/lib.rs b/share-conversion/mpz-share-conversion/src/lib.rs index 4601a8ec..9dfbe808 100644 --- a/share-conversion/mpz-share-conversion/src/lib.rs +++ b/share-conversion/mpz-share-conversion/src/lib.rs @@ -98,11 +98,9 @@ mod tests { use std::marker::PhantomData; - use crate::config::{ReceiverConfig, SenderConfig}; - use mpz_ot::ideal::{ideal_ot_shared_pair, IdealSharedOTReceiver, IdealSharedOTSender}; use mpz_share_conversion_core::{ - fields::{gf2_128::Gf2_128, p256::P256, Field}, + fields::{gf2_128::Gf2_128, p256::P256}, ShareType, }; use rand::SeedableRng;