Skip to content

Commit 9bd8e36

Browse files
xtqqczzextqqczze
committed
clippy: fix needless_pass_by_value lint
https://rust-lang.github.io/rust-clippy/master/#needless_pass_by_value
1 parent 79d5581 commit 9bd8e36

File tree

19 files changed

+122
-121
lines changed

19 files changed

+122
-121
lines changed

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,18 @@ impl<C: NtpClock, SourceId: Hash + Eq + Copy + Debug> KalmanClockController<C, S
127127
}
128128
}
129129

130-
let selection = select::select(
131-
&self.synchronization_config,
132-
&self.algo_config,
133-
self.sources
134-
.iter()
135-
.filter_map(
136-
|(_, (state, usable))| {
137-
if *usable { state.as_ref() } else { None }
138-
},
139-
)
140-
.cloned()
141-
.collect(),
142-
);
130+
let candidates: Vec<_> = self
131+
.sources
132+
.iter()
133+
.filter_map(
134+
|(_, (state, usable))| {
135+
if *usable { state.as_ref() } else { None }
136+
},
137+
)
138+
.cloned()
139+
.collect();
140+
let selection =
141+
select::select(&self.synchronization_config, &self.algo_config, &candidates);
143142

144143
if let Some(combined) = combine(&selection, &self.algo_config) {
145144
info!(

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ enum BoundType {
2020
pub(super) fn select<Index: Copy>(
2121
synchronization_config: &SynchronizationConfig,
2222
algo_config: &AlgorithmConfig,
23-
candidates: Vec<SourceSnapshot<Index>>,
23+
candidates: &[SourceSnapshot<Index>],
2424
) -> Vec<SourceSnapshot<Index>> {
2525
let mut bounds: Vec<(f64, BoundType)> = Vec::with_capacity(2 * candidates.len());
2626

27-
for snapshot in &candidates {
27+
for snapshot in candidates {
2828
if snapshot.period.is_some() {
2929
// Do not let periodic sources be part of the vote for correct time
3030
continue;
@@ -156,7 +156,7 @@ mod tests {
156156
..Default::default()
157157
};
158158

159-
let result = select(&sysconfig, &algconfig, candidates.clone());
159+
let result = select(&sysconfig, &algconfig, &candidates);
160160
assert_eq!(result.len(), 0);
161161

162162
let algconfig = AlgorithmConfig {
@@ -165,7 +165,7 @@ mod tests {
165165
range_delay_weight: 1.0,
166166
..Default::default()
167167
};
168-
let result = select(&sysconfig, &algconfig, candidates.clone());
168+
let result = select(&sysconfig, &algconfig, &candidates);
169169
assert_eq!(result.len(), 0);
170170

171171
let algconfig = AlgorithmConfig {
@@ -174,7 +174,7 @@ mod tests {
174174
range_delay_weight: 1.0,
175175
..Default::default()
176176
};
177-
let result = select(&sysconfig, &algconfig, candidates);
177+
let result = select(&sysconfig, &algconfig, &candidates);
178178
assert_eq!(result.len(), 4);
179179
}
180180

@@ -197,7 +197,7 @@ mod tests {
197197
range_delay_weight: 1.0,
198198
..Default::default()
199199
};
200-
let result = select(&sysconfig, &algconfig, candidates.clone());
200+
let result = select(&sysconfig, &algconfig, &candidates);
201201
assert_eq!(result.len(), 3);
202202

203203
let algconfig = AlgorithmConfig {
@@ -206,7 +206,7 @@ mod tests {
206206
range_delay_weight: 1.0,
207207
..Default::default()
208208
};
209-
let result = select(&sysconfig, &algconfig, candidates.clone());
209+
let result = select(&sysconfig, &algconfig, &candidates);
210210
assert_eq!(result.len(), 2);
211211

212212
let algconfig = AlgorithmConfig {
@@ -215,7 +215,7 @@ mod tests {
215215
range_delay_weight: 1.0,
216216
..Default::default()
217217
};
218-
let result = select(&sysconfig, &algconfig, candidates.clone());
218+
let result = select(&sysconfig, &algconfig, &candidates);
219219
assert_eq!(result.len(), 1);
220220

221221
let algconfig = AlgorithmConfig {
@@ -224,7 +224,7 @@ mod tests {
224224
range_delay_weight: 1.0,
225225
..Default::default()
226226
};
227-
let result = select(&sysconfig, &algconfig, candidates);
227+
let result = select(&sysconfig, &algconfig, &candidates);
228228
assert_eq!(result.len(), 0);
229229
}
230230

@@ -249,14 +249,14 @@ mod tests {
249249
minimum_agreeing_sources: 3,
250250
..Default::default()
251251
};
252-
let result = select(&sysconfig, &algconfig, candidates.clone());
252+
let result = select(&sysconfig, &algconfig, &candidates);
253253
assert_eq!(result.len(), 3);
254254

255255
let sysconfig = SynchronizationConfig {
256256
minimum_agreeing_sources: 4,
257257
..Default::default()
258258
};
259-
let result = select(&sysconfig, &algconfig, candidates);
259+
let result = select(&sysconfig, &algconfig, &candidates);
260260
assert_eq!(result.len(), 0);
261261
}
262262

@@ -279,7 +279,7 @@ mod tests {
279279
minimum_agreeing_sources: 1,
280280
..Default::default()
281281
};
282-
let result = select(&sysconfig, &algconfig, candidates);
282+
let result = select(&sysconfig, &algconfig, &candidates);
283283
assert_eq!(result.len(), 0);
284284
}
285285

@@ -299,14 +299,14 @@ mod tests {
299299
minimum_agreeing_sources: 2,
300300
..Default::default()
301301
};
302-
let result = select(&sysconfig, &algconfig, candidates.clone());
302+
let result = select(&sysconfig, &algconfig, &candidates);
303303
assert_eq!(result.len(), 3);
304304
assert_eq!(result[0].offset(), 0.5);
305305
let sysconfig = SynchronizationConfig {
306306
minimum_agreeing_sources: 3,
307307
..Default::default()
308308
};
309-
let result = select(&sysconfig, &algconfig, candidates);
309+
let result = select(&sysconfig, &algconfig, &candidates);
310310
assert_eq!(result.len(), 0);
311311
}
312312
}

‎ntp-proto/src/algorithm/kalman/source.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ mod tests {
11561156
D: Debug + Clone + Copy,
11571157
N: MeasurementNoiseEstimator<MeasurementDelay = D> + Clone,
11581158
>(
1159-
noise_estimator: N,
1159+
noise_estimator: &N,
11601160
delay: D,
11611161
) {
11621162
let base = NtpTimestamp::from_fixed_int(0);
@@ -1359,7 +1359,7 @@ mod tests {
13591359
#[test]
13601360
fn test_offset_steering_and_measurements_normal() {
13611361
test_offset_steering_and_measurements(
1362-
AveragingBuffer {
1362+
&AveragingBuffer {
13631363
data: [0.0, 0.0, 0.0, 0.0, 0.875e-6, 0.875e-6, 0.875e-6, 0.875e-6],
13641364
next_idx: 0,
13651365
},
@@ -1370,7 +1370,7 @@ mod tests {
13701370
#[test]
13711371
fn test_offset_steering_and_measurements_constant_noise_estimate() {
13721372
test_offset_steering_and_measurements(
1373-
FixedMeasurementNoise {
1373+
&FixedMeasurementNoise {
13741374
precision: 1e-9,
13751375
accuracy: 0.0,
13761376
},

‎ntp-proto/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
#![warn(clippy::needless_bitwise_bool)]
8888
#![warn(clippy::needless_continue)]
8989
#![warn(clippy::needless_for_each)]
90-
//FIXME: Enable #![warn(clippy::needless_pass_by_value)]
90+
#![warn(clippy::needless_pass_by_value)]
9191
#![warn(clippy::needless_raw_string_hashes)]
9292
#![warn(clippy::no_effect_underscore_binding)]
9393
#![warn(clippy::no_mangle_with_rust_abi)]

‎ntp-proto/src/nts/mod.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ pub struct KeyExchangeClient {
334334
}
335335

336336
impl KeyExchangeClient {
337-
pub fn new(config: NtsClientConfig) -> Result<Self, NtsError> {
337+
pub fn new(config: &NtsClientConfig) -> Result<Self, NtsError> {
338338
let builder = tls_utils::client_config_builder_with_protocol_versions(&[&TLS13]);
339339
let verifier =
340340
tls_utils::PlatformVerifier::new_with_extra_roots(config.certificates.iter().cloned())?
@@ -884,7 +884,7 @@ mod tests {
884884
)
885885
.collect::<Result<Arc<_>, _>>()
886886
.unwrap();
887-
let kex = KeyExchangeClient::new(NtsClientConfig {
887+
let kex = KeyExchangeClient::new(&NtsClientConfig {
888888
certificates,
889889
protocol_version: ProtocolVersion::V4,
890890
})
@@ -946,7 +946,7 @@ mod tests {
946946
)
947947
.collect::<Result<Arc<_>, _>>()
948948
.unwrap();
949-
let kex = KeyExchangeClient::new(NtsClientConfig {
949+
let kex = KeyExchangeClient::new(&NtsClientConfig {
950950
certificates,
951951
protocol_version: ProtocolVersion::V5,
952952
})
@@ -1008,7 +1008,7 @@ mod tests {
10081008
)
10091009
.collect::<Result<Arc<_>, _>>()
10101010
.unwrap();
1011-
let kex = KeyExchangeClient::new(NtsClientConfig {
1011+
let kex = KeyExchangeClient::new(&NtsClientConfig {
10121012
certificates,
10131013
protocol_version: ProtocolVersion::V4UpgradingToV5 { tries_left: 8 },
10141014
})
@@ -1070,7 +1070,7 @@ mod tests {
10701070
)
10711071
.collect::<Result<Arc<_>, _>>()
10721072
.unwrap();
1073-
let kex = KeyExchangeClient::new(NtsClientConfig {
1073+
let kex = KeyExchangeClient::new(&NtsClientConfig {
10741074
certificates,
10751075
protocol_version: ProtocolVersion::V4UpgradingToV5 { tries_left: 8 },
10761076
})
@@ -1132,7 +1132,7 @@ mod tests {
11321132
)
11331133
.collect::<Result<Arc<_>, _>>()
11341134
.unwrap();
1135-
let kex = KeyExchangeClient::new(NtsClientConfig {
1135+
let kex = KeyExchangeClient::new(&NtsClientConfig {
11361136
certificates,
11371137
protocol_version: ProtocolVersion::V5,
11381138
})
@@ -1178,7 +1178,7 @@ mod tests {
11781178
)
11791179
.collect::<Result<Arc<_>, _>>()
11801180
.unwrap();
1181-
let kex = KeyExchangeClient::new(NtsClientConfig {
1181+
let kex = KeyExchangeClient::new(&NtsClientConfig {
11821182
certificates,
11831183
protocol_version: ProtocolVersion::V4,
11841184
})

0 commit comments

Comments
 (0)