From 058082fcb0599cf31368025397187ee588af2475 Mon Sep 17 00:00:00 2001 From: Mira Ressel Date: Thu, 16 Mar 2023 15:46:34 +0100 Subject: [PATCH] tweak some pattern matches to address a new clippy warning --- polkadot/node/core/bitfield-signing/src/lib.rs | 2 +- polkadot/node/subsystem-util/src/determine_new_blocks.rs | 2 +- polkadot/runtime/parachains/src/configuration.rs | 2 +- polkadot/runtime/parachains/src/inclusion/mod.rs | 2 +- polkadot/runtime/parachains/src/paras/mod.rs | 4 ++-- polkadot/runtime/parachains/src/scheduler.rs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/polkadot/node/core/bitfield-signing/src/lib.rs b/polkadot/node/core/bitfield-signing/src/lib.rs index 8ea847a414..f02467d7f2 100644 --- a/polkadot/node/core/bitfield-signing/src/lib.rs +++ b/polkadot/node/core/bitfield-signing/src/lib.rs @@ -83,7 +83,7 @@ async fn get_core_availability( sender: &Mutex<&mut impl SubsystemSender>, span: &jaeger::Span, ) -> Result { - if let &CoreState::Occupied(ref core) = core { + if let CoreState::Occupied(core) = core { let _span = span.child("query-chunk-availability"); let (tx, rx) = oneshot::channel(); diff --git a/polkadot/node/subsystem-util/src/determine_new_blocks.rs b/polkadot/node/subsystem-util/src/determine_new_blocks.rs index 5a032c38aa..8bebe969cb 100644 --- a/polkadot/node/subsystem-util/src/determine_new_blocks.rs +++ b/polkadot/node/subsystem-util/src/determine_new_blocks.rs @@ -65,7 +65,7 @@ where } 'outer: loop { - let &(ref last_hash, ref last_header) = ancestry + let (last_hash, last_header) = ancestry .last() .expect("ancestry has length 1 at initialization and is only added to; qed"); diff --git a/polkadot/runtime/parachains/src/configuration.rs b/polkadot/runtime/parachains/src/configuration.rs index 14926c726b..baeb31ef50 100644 --- a/polkadot/runtime/parachains/src/configuration.rs +++ b/polkadot/runtime/parachains/src/configuration.rs @@ -1291,7 +1291,7 @@ impl Pallet { // First, we need to decide what we should use as the base configuration. let mut base_config = pending_configs .last() - .map(|&(_, ref config)| config.clone()) + .map(|(_, config)| config.clone()) .unwrap_or_else(Self::config); let base_config_consistent = base_config.check_consistency().is_ok(); diff --git a/polkadot/runtime/parachains/src/inclusion/mod.rs b/polkadot/runtime/parachains/src/inclusion/mod.rs index d73dac9031..e2bd5f8511 100644 --- a/polkadot/runtime/parachains/src/inclusion/mod.rs +++ b/polkadot/runtime/parachains/src/inclusion/mod.rs @@ -643,7 +643,7 @@ impl Pallet { }; // one more sweep for actually writing to storage. - let core_indices = core_indices_and_backers.iter().map(|&(ref c, _, _)| *c).collect(); + let core_indices = core_indices_and_backers.iter().map(|(c, _, _)| *c).collect(); for (candidate, (core, backers, group)) in candidates.into_iter().zip(core_indices_and_backers) { diff --git a/polkadot/runtime/parachains/src/paras/mod.rs b/polkadot/runtime/parachains/src/paras/mod.rs index 420ed3e640..93988c5a65 100644 --- a/polkadot/runtime/parachains/src/paras/mod.rs +++ b/polkadot/runtime/parachains/src/paras/mod.rs @@ -1260,13 +1260,13 @@ impl Pallet { UpcomingUpgrades::::mutate(|upcoming_upgrades| { *upcoming_upgrades = mem::take(upcoming_upgrades) .into_iter() - .filter(|&(ref para, _)| !outgoing.contains(para)) + .filter(|(para, _)| !outgoing.contains(para)) .collect(); }); UpgradeCooldowns::::mutate(|upgrade_cooldowns| { *upgrade_cooldowns = mem::take(upgrade_cooldowns) .into_iter() - .filter(|&(ref para, _)| !outgoing.contains(para)) + .filter(|(para, _)| !outgoing.contains(para)) .collect(); }); } diff --git a/polkadot/runtime/parachains/src/scheduler.rs b/polkadot/runtime/parachains/src/scheduler.rs index 58509350a3..c27bfb6fc4 100644 --- a/polkadot/runtime/parachains/src/scheduler.rs +++ b/polkadot/runtime/parachains/src/scheduler.rs @@ -235,7 +235,7 @@ impl Pallet { pub(crate) fn initializer_on_new_session( notification: &SessionChangeNotification, ) { - let &SessionChangeNotification { ref validators, ref new_config, .. } = notification; + let SessionChangeNotification { validators, new_config, .. } = notification; let config = new_config; let mut thread_queue = ParathreadQueue::::get();