From 8e1a33bd8ac544c5ac1a9a6d3ffde635e11d51f3 Mon Sep 17 00:00:00 2001 From: John Baublitz Date: Tue, 11 May 2021 13:30:51 -0400 Subject: [PATCH 1/2] Deny unused self parameters in clippy --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4a1ba005e5..226eb0c3be 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ CLIPPY_PEDANTIC = -D clippy::await_holding_lock \ -D clippy::unreadable_literal \ -D clippy::unsafe_derive_deserialize \ -A clippy::unseparated_literal_suffix \ - -A clippy::unused_self \ + -D clippy::unused_self \ -D clippy::used_underscore_binding \ -D clippy::used_underscore_binding \ -D clippy::verbose_bit_mask \ From 6880795ad11101d7a82a880ed9e0a8e01c4a1756 Mon Sep 17 00:00:00 2001 From: John Baublitz Date: Tue, 11 May 2021 14:35:18 -0400 Subject: [PATCH 2/2] Remove unused self parameters --- src/engine/sim_engine/pool.rs | 1 + src/engine/strat_engine/backstore/crypt/initialize.rs | 5 ++--- src/engine/strat_engine/keys.rs | 1 - src/engine/strat_engine/tests/crypt.rs | 2 +- src/engine/strat_engine/thinpool/filesystem.rs | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/engine/sim_engine/pool.rs b/src/engine/sim_engine/pool.rs index 4b74c764b8..ea60bbfbd5 100644 --- a/src/engine/sim_engine/pool.rs +++ b/src/engine/sim_engine/pool.rs @@ -78,6 +78,7 @@ impl SimPool { self.encryption_info().is_encrypted() } + #[allow(clippy::unused_self)] pub fn destroy(&mut self) -> StratisResult<()> { Ok(()) } diff --git a/src/engine/strat_engine/backstore/crypt/initialize.rs b/src/engine/strat_engine/backstore/crypt/initialize.rs index d758b3471f..6ca90a686e 100644 --- a/src/engine/strat_engine/backstore/crypt/initialize.rs +++ b/src/engine/strat_engine/backstore/crypt/initialize.rs @@ -127,7 +127,6 @@ impl CryptInitializer { /// Initialize with a passphrase in the kernel keyring only. fn initialize_with_keyring( - &self, device: &mut CryptDevice, key_description: &KeyDescription, ) -> StratisResult<()> { @@ -187,7 +186,7 @@ impl CryptInitializer { key_description: &KeyDescription, (pin, json, yes): (&str, &Value, bool), ) -> StratisResult<()> { - self.initialize_with_keyring(&mut device, key_description)?; + Self::initialize_with_keyring(&mut device, key_description)?; let fs = MemoryPrivateFilesystem::new()?; fs.key_op(key_description, |kf| { @@ -228,7 +227,7 @@ impl CryptInitializer { self.acquire_crypt_device()? } (Some(kd), _) => { - self.initialize_with_keyring(&mut device, kd)?; + Self::initialize_with_keyring(&mut device, kd)?; device } (_, Some(ci)) => { diff --git a/src/engine/strat_engine/keys.rs b/src/engine/strat_engine/keys.rs index ebdb296053..2f7066ce14 100644 --- a/src/engine/strat_engine/keys.rs +++ b/src/engine/strat_engine/keys.rs @@ -388,7 +388,6 @@ impl StratKeyActions { /// of the key. This method is only useful for testing stratisd internally. It /// is not useful for testing using D-Bus. pub fn set_no_fd( - &mut self, key_desc: &KeyDescription, key: SizedKeyMemory, ) -> StratisResult> { diff --git a/src/engine/strat_engine/tests/crypt.rs b/src/engine/strat_engine/tests/crypt.rs index 2341896310..db04ea94bc 100644 --- a/src/engine/strat_engine/tests/crypt.rs +++ b/src/engine/strat_engine/tests/crypt.rs @@ -36,7 +36,7 @@ where .unwrap(); let key_data = SizedKeyMemory::new(mem, MAX_STRATIS_PASS_SIZE); - key_handle.set_no_fd(&key_description, key_data)?; + StratKeyActions::set_no_fd(&key_description, key_data)?; let result = test(physical_paths, &key_description, input); diff --git a/src/engine/strat_engine/thinpool/filesystem.rs b/src/engine/strat_engine/thinpool/filesystem.rs index a6cb7cc6be..8d67281016 100644 --- a/src/engine/strat_engine/thinpool/filesystem.rs +++ b/src/engine/strat_engine/thinpool/filesystem.rs @@ -234,7 +234,7 @@ impl StratFilesystem { if free_bytes.sectors() < FILESYSTEM_LOWATER { let mut table = self.thin_dev.table().table.clone(); table.length = - self.thin_dev.size() + self.extend_size(self.thin_dev.size()); + self.thin_dev.size() + Self::extend_size(self.thin_dev.size()); if self.thin_dev.set_table(get_dm(), table).is_err() { return Ok(false); } @@ -260,7 +260,7 @@ impl StratFilesystem { /// Return an extend size for the thindev under the filesystem /// TODO: returning the current size will double the space provisioned to /// the thin device. We should determine if this is a reasonable value. - fn extend_size(&self, current_size: Sectors) -> Sectors { + fn extend_size(current_size: Sectors) -> Sectors { current_size }