Pedantic linting

ntp-proto/src/algorithm/kalman/combiner.rs

@@ -41,7 +41,7 @@ pub(super) fn combine<Index: Copy>(
     selection.first().map(|first| {
         let mut estimate = first.state;
         if !algo_config.ignore_server_dispersion {
-            estimate = estimate.add_server_dispersion(first.source_uncertainty.to_seconds())
+            estimate = estimate.add_server_dispersion(first.source_uncertainty.to_seconds());
         }
 
         let mut used_sources = vec![(first.index, estimate.uncertainty.determinant())];

ntp-proto/src/algorithm/kalman/config.rs

@@ -27,7 +27,7 @@ pub struct AlgorithmConfig {
     #[serde(default = "default_poll_interval_low_weight")]
     pub poll_interval_low_weight: f64,
     /// Amount which a measurement contributes to the state, above
-    /// which we start decreasing the poll_interval interval. (weight, 0-1)
+    /// which we start decreasing the `poll_interval` interval. (weight, 0-1)
     #[serde(default = "default_poll_interval_high_weight")]
     pub poll_interval_high_weight: f64,
     /// Amount of hysteresis in changing the poll interval (count, 1+)

ntp-proto/src/algorithm/kalman/mod.rs

@@ -111,16 +111,17 @@ impl<C: NtpClock, SourceId: Hash + Eq + Copy + Debug> KalmanClockController<C, S
                 next_update: None,
             };
         }
-        for (_, (state, _)) in self.sources.iter_mut() {
+        for (state, _) in self.sources.values_mut() {
             if let Some(ref mut snapshot) = state {
-                snapshot.state = snapshot.state.progress_time(time, snapshot.wander)
+                snapshot.state = snapshot.state.progress_time(time, snapshot.wander);
             }
         }
 
         let selection = select::select(
             &self.synchronization_config,
             &self.algo_config,
-            self.sources
+            &self
+                .sources
                 .iter()
                 .filter_map(
                     |(_, (state, usable))| {
@@ -131,8 +132,8 @@ impl<C: NtpClock, SourceId: Hash + Eq + Copy + Debug> KalmanClockController<C, S
                         }
                     },
                 )
-                .cloned()
-                .collect(),
+                .copied()
+                .collect::<Vec<SourceSnapshot<SourceId>>>(),
         );
 
         if let Some(combined) = combine(&selection, &self.algo_config) {
@@ -237,8 +238,7 @@ impl<C: NtpClock, SourceId: Hash + Eq + Copy + Debug> KalmanClockController<C, S
                 || self
                     .synchronization_config
                     .accumulated_step_panic_threshold
-                    .map(|v| self.timedata.accumulated_steps > v)
-                    .unwrap_or(false)
+                    .is_some_and(|v| self.timedata.accumulated_steps > v)
             {
                 error!("Unusually large clock step suggested, please manually verify system clock and reference clock state and restart if appropriate. If the clock is significantly wrong, you can use `ntp-ctl force-sync` to correct it.");
                 #[cfg(not(test))]
@@ -315,10 +315,11 @@ impl<C: NtpClock, SourceId: Hash + Eq + Copy + Debug> KalmanClockController<C, S
             .expect("Cannot adjust clock");
         for (state, _) in self.sources.values_mut() {
             if let Some(ref mut state) = state {
-                state.state =
-                    state
-                        .state
-                        .process_frequency_steering(freq_update, actual_change, state.wander)
+                state.state = state.state.process_frequency_steering(
+                    freq_update,
+                    actual_change,
+                    state.wander,
+                );
             }
         }
         debug!(
@@ -581,7 +582,7 @@ mod tests {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "Threshold exceeded")]
     fn jumps_add_absolutely() {
         let synchronization_config = SynchronizationConfig {
             minimum_agreeing_sources: 1,
@@ -610,6 +611,7 @@ mod tests {
         algo.steer_offset(-1000.0, 0.0);
     }
 
+    #[allow(clippy::float_cmp)]
     #[test]
     fn test_jumps_update_state() {
         let synchronization_config = SynchronizationConfig::default();
@@ -700,7 +702,7 @@ mod tests {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "Threshold exceeded")]
     fn test_large_offset_eventually_panics() {
         let synchronization_config = SynchronizationConfig {
             minimum_agreeing_sources: 1,
@@ -755,7 +757,7 @@ mod tests {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "Threshold exceeded")]
     fn test_backward_step_panics_before_steer() {
         let synchronization_config = SynchronizationConfig {
             minimum_agreeing_sources: 1,

ntp-proto/src/algorithm/kalman/select.rs

@@ -19,11 +19,11 @@ enum BoundType {
 pub(super) fn select<Index: Copy>(
     synchronization_config: &SynchronizationConfig,
     algo_config: &AlgorithmConfig,
-    candidates: Vec<SourceSnapshot<Index>>,
+    candidates: &[SourceSnapshot<Index>],
 ) -> Vec<SourceSnapshot<Index>> {
     let mut bounds: Vec<(f64, BoundType)> = Vec::with_capacity(2 * candidates.len());
 
-    for snapshot in candidates.iter() {
+    for snapshot in candidates {
         let radius = snapshot.offset_uncertainty() * algo_config.range_statistical_weight
             + snapshot.delay * algo_config.range_delay_weight;
         if radius > algo_config.maximum_source_uncertainty
@@ -42,7 +42,7 @@ pub(super) fn select<Index: Copy>(
     let mut maxt: f64 = 0.0;
     let mut cur: usize = 0;
 
-    for (time, boundtype) in bounds.iter() {
+    for (time, boundtype) in &bounds {
         match boundtype {
             BoundType::Start => cur += 1,
             BoundType::End => cur -= 1,
@@ -64,7 +64,7 @@ pub(super) fn select<Index: Copy>(
                     && snapshot.offset() + radius >= maxt
                     && snapshot.leap_indicator.is_synchronized()
             })
-            .cloned()
+            .copied()
             .collect()
     } else {
         vec![]
@@ -125,7 +125,7 @@ mod tests {
             ..Default::default()
         };
 
-        let result = select(&sysconfig, &algconfig, candidates.clone());
+        let result = select(&sysconfig, &algconfig, &candidates.clone());
         assert_eq!(result.len(), 0);
 
         let algconfig = AlgorithmConfig {
@@ -134,7 +134,7 @@ mod tests {
             range_delay_weight: 1.0,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates.clone());
+        let result = select(&sysconfig, &algconfig, &candidates.clone());
         assert_eq!(result.len(), 0);
 
         let algconfig = AlgorithmConfig {
@@ -143,7 +143,7 @@ mod tests {
             range_delay_weight: 1.0,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates);
+        let result = select(&sysconfig, &algconfig, &candidates);
         assert_eq!(result.len(), 4);
     }
 
@@ -166,7 +166,7 @@ mod tests {
             range_delay_weight: 1.0,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates.clone());
+        let result = select(&sysconfig, &algconfig, &candidates.clone());
         assert_eq!(result.len(), 3);
 
         let algconfig = AlgorithmConfig {
@@ -175,7 +175,7 @@ mod tests {
             range_delay_weight: 1.0,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates.clone());
+        let result = select(&sysconfig, &algconfig, &candidates.clone());
         assert_eq!(result.len(), 2);
 
         let algconfig = AlgorithmConfig {
@@ -184,7 +184,7 @@ mod tests {
             range_delay_weight: 1.0,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates.clone());
+        let result = select(&sysconfig, &algconfig, &candidates.clone());
         assert_eq!(result.len(), 1);
 
         let algconfig = AlgorithmConfig {
@@ -193,7 +193,7 @@ mod tests {
             range_delay_weight: 1.0,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates);
+        let result = select(&sysconfig, &algconfig, &candidates);
         assert_eq!(result.len(), 0);
     }
 
@@ -218,14 +218,14 @@ mod tests {
             minimum_agreeing_sources: 3,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates.clone());
+        let result = select(&sysconfig, &algconfig, &candidates.clone());
         assert_eq!(result.len(), 3);
 
         let sysconfig = SynchronizationConfig {
             minimum_agreeing_sources: 4,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates);
+        let result = select(&sysconfig, &algconfig, &candidates);
         assert_eq!(result.len(), 0);
     }
 
@@ -248,7 +248,7 @@ mod tests {
             minimum_agreeing_sources: 1,
             ..Default::default()
         };
-        let result = select(&sysconfig, &algconfig, candidates);
+        let result = select(&sysconfig, &algconfig, &candidates);
         assert_eq!(result.len(), 0);
     }
 }