From d3b89add9aa8d7329bbb2afc7b2288fc1ea95189 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Fri, 16 Dec 2022 10:59:18 +0100 Subject: [PATCH 1/4] daemon: apply clippy 1.66.0 fixes --- src/commands/mod.rs | 6 ++---- src/commands/utils.rs | 2 +- src/config.rs | 2 +- src/database/sqlite/mod.rs | 14 +++++++------- src/jsonrpc/api.rs | 8 +++----- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/commands/mod.rs b/src/commands/mod.rs index 06903489..64a4bc08 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -234,6 +234,7 @@ impl DaemonControl { /// Get a list of all known coins. pub fn list_coins(&self) -> ListCoinsResult { let mut db_conn = self.db.connection(); + #[allow(clippy::iter_kv_map)] // Because Rust 1.48 let coins: Vec = db_conn .coins(CoinType::All) // Can't use into_values as of Rust 1.48 @@ -381,10 +382,7 @@ impl DaemonControl { .ok_or(CommandError::InsufficientFunds( in_value, out_value, feerate_vb, ))?; - let nochange_feerate_vb = absolute_fee - .to_sat() - .checked_div(nochange_vb as u64) - .unwrap(); + let nochange_feerate_vb = absolute_fee.to_sat().checked_div(nochange_vb).unwrap(); if nochange_feerate_vb.checked_mul(10).unwrap() < feerate_vb.checked_mul(9).unwrap() { return Err(CommandError::InsufficientFunds( in_value, out_value, feerate_vb, diff --git a/src/commands/utils.rs b/src/commands/utils.rs index b10a95fe..58fe4972 100644 --- a/src/commands/utils.rs +++ b/src/commands/utils.rs @@ -33,7 +33,7 @@ where T: consensus::Decodable, { let s = String::deserialize(d)?; - let s = base64::decode(&s).map_err(de::Error::custom)?; + let s = base64::decode(s).map_err(de::Error::custom)?; consensus::deserialize(&s).map_err(de::Error::custom) } diff --git a/src/config.rs b/src/config.rs index 111a438b..dc6b831b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -188,7 +188,7 @@ impl Config { let config_file = custom_path.unwrap_or(config_file_path().ok_or(ConfigError::DatadirNotFound)?); - let config = toml::from_slice::(&std::fs::read(&config_file)?) + let config = toml::from_slice::(&std::fs::read(config_file)?) .map_err(|e| ConfigError::ReadingFile(format!("Parsing configuration file: {}", e)))?; config.check()?; diff --git a/src/database/sqlite/mod.rs b/src/database/sqlite/mod.rs index 9f8ca382..e9a3e88a 100644 --- a/src/database/sqlite/mod.rs +++ b/src/database/sqlite/mod.rs @@ -647,7 +647,7 @@ mod tests { db.sanity_check(bitcoin::Network::Bitcoin, &options.main_descriptor) .unwrap(); - fs::remove_dir_all(&tmp_dir).unwrap(); + fs::remove_dir_all(tmp_dir).unwrap(); } #[test] @@ -675,7 +675,7 @@ mod tests { assert_eq!(db_tip.block_hash.unwrap(), new_tip.hash); } - fs::remove_dir_all(&tmp_dir).unwrap(); + fs::remove_dir_all(tmp_dir).unwrap(); } #[test] @@ -819,7 +819,7 @@ mod tests { assert_eq!(coin.spend_block.unwrap().height, height); } - fs::remove_dir_all(&tmp_dir).unwrap(); + fs::remove_dir_all(tmp_dir).unwrap(); } #[test] @@ -916,7 +916,7 @@ mod tests { } } - fs::remove_dir_all(&tmp_dir).unwrap(); + fs::remove_dir_all(tmp_dir).unwrap(); } #[test] @@ -1104,7 +1104,7 @@ mod tests { assert_eq!(db_coins[&coins[4].outpoint], coin); } - fs::remove_dir_all(&tmp_dir).unwrap(); + fs::remove_dir_all(tmp_dir).unwrap(); } #[test] @@ -1142,7 +1142,7 @@ mod tests { assert_eq!(db_wallet.timestamp, dummy_timestamp); } - fs::remove_dir_all(&tmp_dir).unwrap(); + fs::remove_dir_all(tmp_dir).unwrap(); } #[test] @@ -1295,6 +1295,6 @@ mod tests { ); } - fs::remove_dir_all(&tmp_dir).unwrap(); + fs::remove_dir_all(tmp_dir).unwrap(); } } diff --git a/src/jsonrpc/api.rs b/src/jsonrpc/api.rs index 4b142bbf..b7c85e3d 100644 --- a/src/jsonrpc/api.rs +++ b/src/jsonrpc/api.rs @@ -105,11 +105,9 @@ fn list_confirmed(control: &DaemonControl, params: Params) -> Result Result { From ab9fff4395c9d368d4d8c795af4d4ada295ac36b Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Fri, 16 Dec 2022 11:01:34 +0100 Subject: [PATCH 2/4] Remove clippy.toml I had put it (following rust-bitcoin) because of the MSRV, but it looks like clippy doesn't care. --- clippy.toml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 clippy.toml diff --git a/clippy.toml b/clippy.toml deleted file mode 100644 index f691ea3d..00000000 --- a/clippy.toml +++ /dev/null @@ -1 +0,0 @@ -msrv = "1.48" From d529cd8b6c7245852deacbfa9d14b349b1ad04e3 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Fri, 16 Dec 2022 11:02:42 +0100 Subject: [PATCH 3/4] ci: pin clippy at 1.66.0 To avoid future breakage. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9006ec29..c50813cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.66.0 components: rustfmt, clippy override: true - name: rustfmt From f996e2565797b413870d75fa764ebd207bb264c4 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Fri, 16 Dec 2022 11:05:56 +0100 Subject: [PATCH 4/4] ci: pin clippy to 1.65.0 for the GUI --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c50813cf..612fbc14 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,8 +52,8 @@ jobs: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: stable - components: rustfmt + toolchain: 1.65.0 + components: rustfmt, clippy override: true - name: rustfmt run: cd gui && cargo fmt -- --check