tweak some pattern matches to address a new clippy warning

This commit is contained in:
Mira Ressel
2023-03-16 15:46:34 +01:00
parent a01de76ca1
commit 058082fcb0
6 changed files with 7 additions and 7 deletions
@@ -83,7 +83,7 @@ async fn get_core_availability(
sender: &Mutex<&mut impl SubsystemSender<overseer::BitfieldSigningOutgoingMessages>>, sender: &Mutex<&mut impl SubsystemSender<overseer::BitfieldSigningOutgoingMessages>>,
span: &jaeger::Span, span: &jaeger::Span,
) -> Result<bool, Error> { ) -> Result<bool, Error> {
if let &CoreState::Occupied(ref core) = core { if let CoreState::Occupied(core) = core {
let _span = span.child("query-chunk-availability"); let _span = span.child("query-chunk-availability");
let (tx, rx) = oneshot::channel(); let (tx, rx) = oneshot::channel();
@@ -65,7 +65,7 @@ where
} }
'outer: loop { 'outer: loop {
let &(ref last_hash, ref last_header) = ancestry let (last_hash, last_header) = ancestry
.last() .last()
.expect("ancestry has length 1 at initialization and is only added to; qed"); .expect("ancestry has length 1 at initialization and is only added to; qed");
@@ -1291,7 +1291,7 @@ impl<T: Config> Pallet<T> {
// First, we need to decide what we should use as the base configuration. // First, we need to decide what we should use as the base configuration.
let mut base_config = pending_configs let mut base_config = pending_configs
.last() .last()
.map(|&(_, ref config)| config.clone()) .map(|(_, config)| config.clone())
.unwrap_or_else(Self::config); .unwrap_or_else(Self::config);
let base_config_consistent = base_config.check_consistency().is_ok(); let base_config_consistent = base_config.check_consistency().is_ok();
@@ -643,7 +643,7 @@ impl<T: Config> Pallet<T> {
}; };
// one more sweep for actually writing to storage. // 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 for (candidate, (core, backers, group)) in
candidates.into_iter().zip(core_indices_and_backers) candidates.into_iter().zip(core_indices_and_backers)
{ {
+2 -2
View File
@@ -1260,13 +1260,13 @@ impl<T: Config> Pallet<T> {
UpcomingUpgrades::<T>::mutate(|upcoming_upgrades| { UpcomingUpgrades::<T>::mutate(|upcoming_upgrades| {
*upcoming_upgrades = mem::take(upcoming_upgrades) *upcoming_upgrades = mem::take(upcoming_upgrades)
.into_iter() .into_iter()
.filter(|&(ref para, _)| !outgoing.contains(para)) .filter(|(para, _)| !outgoing.contains(para))
.collect(); .collect();
}); });
UpgradeCooldowns::<T>::mutate(|upgrade_cooldowns| { UpgradeCooldowns::<T>::mutate(|upgrade_cooldowns| {
*upgrade_cooldowns = mem::take(upgrade_cooldowns) *upgrade_cooldowns = mem::take(upgrade_cooldowns)
.into_iter() .into_iter()
.filter(|&(ref para, _)| !outgoing.contains(para)) .filter(|(para, _)| !outgoing.contains(para))
.collect(); .collect();
}); });
} }
+1 -1
View File
@@ -235,7 +235,7 @@ impl<T: Config> Pallet<T> {
pub(crate) fn initializer_on_new_session( pub(crate) fn initializer_on_new_session(
notification: &SessionChangeNotification<T::BlockNumber>, notification: &SessionChangeNotification<T::BlockNumber>,
) { ) {
let &SessionChangeNotification { ref validators, ref new_config, .. } = notification; let SessionChangeNotification { validators, new_config, .. } = notification;
let config = new_config; let config = new_config;
let mut thread_queue = ParathreadQueue::<T>::get(); let mut thread_queue = ParathreadQueue::<T>::get();