From 3cd2c3585ced4565a96017a4f80f98d13d039206 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 5 Nov 2018 19:30:37 +0100 Subject: [PATCH] Remove clippy feature, reformat --- Cargo.toml | 1 - src/bloomfilter/lib.rs | 23 +++++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2807937..436518e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,6 @@ name = "bloomfilter" path = "src/bloomfilter/lib.rs" [dependencies] -clippy = {version = "~0", optional = true} bit-vec = "~0.4" rand = "~0.3" siphasher = "^0.2.2" diff --git a/src/bloomfilter/lib.rs b/src/bloomfilter/lib.rs index cd1b2d8..4a3ab51 100644 --- a/src/bloomfilter/lib.rs +++ b/src/bloomfilter/lib.rs @@ -6,13 +6,10 @@ //! 2 hash functions, generated with SipHash-1-3 using randomized keys. //! -#![crate_name="bloomfilter"] +#![crate_name = "bloomfilter"] #![crate_type = "rlib"] #![warn(non_camel_case_types, non_upper_case_globals, unused_qualifications)] -#![cfg_attr(feature="clippy", feature(plugin))] -#![cfg_attr(feature="clippy", plugin(clippy))] - extern crate bit_vec; extern crate rand; extern crate siphasher; @@ -48,10 +45,10 @@ impl Bloom { let bitmap = BitVec::from_elem(bitmap_bits as usize, false); let sips = [Self::sip_new(), Self::sip_new()]; Self { - bitmap: bitmap, - bitmap_bits: bitmap_bits, - k_num: k_num, - sips: sips, + bitmap, + bitmap_bits, + k_num, + sips, _phantom: PhantomData, } } @@ -229,9 +226,11 @@ fn bloom_test_load() { original.set(&key); assert!(original.check(&key) == true); - let cloned = Bloom::from_existing(&original.bitmap(), - original.number_of_bits(), - original.number_of_hash_functions(), - original.sip_keys()); + let cloned = Bloom::from_existing( + &original.bitmap(), + original.number_of_bits(), + original.number_of_hash_functions(), + original.sip_keys(), + ); assert!(cloned.check(&key) == true); }