chore: apply new clippy 1.73 suggestions

bitflags 1.3 won't be updated to avoid triggering the bad-bit-macro check, it really is time to update to bitflags 2.
paritytech · Oct 10, 2023 · ebd894c · ebd894c
1 parent fb97a9e
commit ebd894c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -30,4 +30,6 @@ rustflags = [
   "-Aclippy::derivable_impls",           # false positives
   "-Aclippy::stable_sort_primitive",     # prefer stable sort
   "-Aclippy::extra-unused-type-parameters", # stylistic
+  "-Aclippy::default_constructed_unit_structs", # stylistic
+  "-Aclippy::bad-bit-mask",              # triggered by macro behaviour in bitflags 1.3.2
 ]
diff --git a/polkadot/node/core/backing/src/tests/mod.rs b/polkadot/node/core/backing/src/tests/mod.rs
@@ -1595,8 +1595,8 @@ fn retry_works() {
 				},
 				AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 					_,
-					RuntimeApiRequest::SessionExecutorParams(sess_idx, tx),
-				)) if sess_idx == 1 => {
+					RuntimeApiRequest::SessionExecutorParams(1, tx),
+				)) => {
 					tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
 				},
 				msg => {

diff --git a/polkadot/node/overseer/examples/minimal-example.rs b/polkadot/node/overseer/examples/minimal-example.rs
@@ -163,7 +163,6 @@ fn main() {
 			.unwrap();
 
 		let overseer_fut = overseer.run().fuse();
-		let timer_stream = timer_stream;
 
 		pin_mut!(timer_stream);
 		pin_mut!(overseer_fut);

diff --git a/substrate/client/network/src/protocol/notifications/behaviour.rs b/substrate/client/network/src/protocol/notifications/behaviour.rs
@@ -1423,7 +1423,6 @@ impl NetworkBehaviour for Notifications {
 									let delay_id = self.next_delay_id;
 									self.next_delay_id.0 += 1;
 									let delay = futures_timer::Delay::new(ban_duration);
-									let peer_id = peer_id;
 									self.delays.push(
 										async move {
 											delay.await;

diff --git a/substrate/frame/preimage/src/migration.rs b/substrate/frame/preimage/src/migration.rs
@@ -133,7 +133,7 @@ pub mod v1 {
 						None =>
 							OldRequestStatus::Requested { deposit: None, count: 1, len: Some(len) },
 					},
-					v0::OldRequestStatus::Requested(count) if count == 0 => {
+					v0::OldRequestStatus::Requested(0) => {
 						log::error!(target: TARGET, "preimage has counter of zero: {:?}", hash);
 						continue
 					},

diff --git a/substrate/utils/frame/benchmarking-cli/src/pallet/writer.rs b/substrate/utils/frame/benchmarking-cli/src/pallet/writer.rs
@@ -779,6 +779,7 @@ fn worst_case_pov(
 
 /// A simple match statement which outputs the log 16 of some value.
 fn easy_log_16(i: u32) -> u32 {
+	#[allow(clippy::redundant_guards)]
 	match i {
 		i if i == 0 => 0,
 		i if i <= 16 => 1,