Skip to content

Commit 78dcb1a

Browse files
iwanbkLeeSmet
authored andcommitted
fix various clippy warnings
1 parent 74719ba commit 78dcb1a

File tree

7 files changed

+19
-22
lines changed

7 files changed

+19
-22
lines changed

mycelium-api/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ impl<'de> Deserialize<'de> for Metric {
293293
{
294294
struct MetricVisitor;
295295

296-
impl<'de> serde::de::Visitor<'de> for MetricVisitor {
296+
impl serde::de::Visitor<'_> for MetricVisitor {
297297
type Value = Metric;
298298

299299
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

mycelium/src/crypto.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl Serialize for PublicKey {
266266
}
267267

268268
struct PublicKeyVisitor;
269-
impl<'de> Visitor<'de> for PublicKeyVisitor {
269+
impl Visitor<'_> for PublicKeyVisitor {
270270
type Value = PublicKey;
271271

272272
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -336,23 +336,23 @@ impl Deref for PacketBuffer {
336336
}
337337
}
338338

339-
impl<'a> Deref for PacketBufferHeader<'a> {
339+
impl Deref for PacketBufferHeader<'_> {
340340
type Target = [u8; DATA_HEADER_SIZE];
341341

342342
fn deref(&self) -> &Self::Target {
343343
self.data
344344
}
345345
}
346346

347-
impl<'a> Deref for PacketBufferHeaderMut<'a> {
347+
impl Deref for PacketBufferHeaderMut<'_> {
348348
type Target = [u8; DATA_HEADER_SIZE];
349349

350350
fn deref(&self) -> &Self::Target {
351351
self.data
352352
}
353353
}
354354

355-
impl<'a> DerefMut for PacketBufferHeaderMut<'a> {
355+
impl DerefMut for PacketBufferHeaderMut<'_> {
356356
fn deref_mut(&mut self) -> &mut Self::Target {
357357
self.data
358358
}

mycelium/src/message.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,7 @@ where
306306
}
307307
message.state = TransmissionState::InProgress;
308308
// Transform message into chunks.
309-
let mut chunks =
310-
Vec::with_capacity((message.len + AVERAGE_CHUNK_SIZE - 1) / AVERAGE_CHUNK_SIZE);
309+
let mut chunks = Vec::with_capacity(message.len.div_ceil(AVERAGE_CHUNK_SIZE));
311310
for (chunk_idx, data_chunk) in
312311
message.msg.data.chunks(AVERAGE_CHUNK_SIZE).enumerate()
313312
{
@@ -382,8 +381,7 @@ where
382381
// Otherwise unilaterally reset the state. The message id space is large enough to
383382
// avoid accidental collisions.
384383
let mi = MessageInit::new(mp);
385-
let expected_chunks =
386-
(mi.length() as usize + AVERAGE_CHUNK_SIZE - 1) / AVERAGE_CHUNK_SIZE;
384+
let expected_chunks = (mi.length() as usize).div_ceil(AVERAGE_CHUNK_SIZE);
387385
let chunks = vec![None; expected_chunks];
388386
let message = ReceivedMessageInfo {
389387
id: message_id,
@@ -418,8 +416,7 @@ where
418416
return;
419417
}
420418
// Check max chunk idx.
421-
let max_chunk_idx =
422-
((message.len + MINIMUM_CHUNK_SIZE - 1) / MINIMUM_CHUNK_SIZE) - 1;
419+
let max_chunk_idx = message.len.div_ceil(MINIMUM_CHUNK_SIZE);
423420
if mc.chunk_idx() > max_chunk_idx {
424421
debug!("Dropping CHUNK because index is too high");
425422
return;
@@ -1132,7 +1129,7 @@ impl Serialize for MessageId {
11321129

11331130
struct MessageIdVisitor;
11341131

1135-
impl<'de> Visitor<'de> for MessageIdVisitor {
1132+
impl Visitor<'_> for MessageIdVisitor {
11361133
type Value = MessageId;
11371134

11381135
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -1234,7 +1231,7 @@ struct Flags<'a> {
12341231
_marker: PhantomData<&'a MessagePacketHeader<'a>>,
12351232
}
12361233

1237-
impl<'a> Flags<'a> {
1234+
impl Flags<'_> {
12381235
/// Check if the MESSAGE_INIT flag is set on the header.
12391236
fn init(&self) -> bool {
12401237
self.flags & FLAG_MESSAGE_INIT != 0
@@ -1334,7 +1331,7 @@ impl FlagsMut<'_, '_> {
13341331
// - 8 bytes message id
13351332
// - 2 bytes flags
13361333
// - 2 bytes reserved
1337-
impl<'a> MessagePacketHeader<'a> {
1334+
impl MessagePacketHeader<'_> {
13381335
/// Get the [`MessageId`] from the buffer.
13391336
fn message_id(&self) -> MessageId {
13401337
MessageId(
@@ -1400,23 +1397,23 @@ impl<'a> MessagePacketHeaderMut<'a> {
14001397
}
14011398
}
14021399

1403-
impl<'a> Deref for MessagePacketHeader<'a> {
1400+
impl Deref for MessagePacketHeader<'_> {
14041401
type Target = [u8; MESSAGE_HEADER_SIZE];
14051402

14061403
fn deref(&self) -> &Self::Target {
14071404
self.header
14081405
}
14091406
}
14101407

1411-
impl<'a> Deref for MessagePacketHeaderMut<'a> {
1408+
impl Deref for MessagePacketHeaderMut<'_> {
14121409
type Target = [u8; MESSAGE_HEADER_SIZE];
14131410

14141411
fn deref(&self) -> &Self::Target {
14151412
self.header
14161413
}
14171414
}
14181415

1419-
impl<'a> DerefMut for MessagePacketHeaderMut<'a> {
1416+
impl DerefMut for MessagePacketHeaderMut<'_> {
14201417
fn deref_mut(&mut self) -> &mut Self::Target {
14211418
self.header
14221419
}

mycelium/src/metric.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ impl Add<&Metric> for Metric {
113113
}
114114
}
115115

116-
impl<'a> Add<Metric> for &'a Metric {
116+
impl Add<Metric> for &Metric {
117117
type Output = Metric;
118118

119119
fn add(self, rhs: Metric) -> Self::Output {

mycelium/src/routing_table.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,13 +425,13 @@ pub struct RoutingTableReadGuard<'a> {
425425
guard: left_right::ReadGuard<'a, RoutingTableInner>,
426426
}
427427

428-
impl<'a> RoutingTableReadGuard<'a> {
428+
impl RoutingTableReadGuard<'_> {
429429
pub fn iter(&self) -> RoutingTableIter {
430430
RoutingTableIter::new(self.guard.table.iter())
431431
}
432432
}
433433

434-
impl<'a> WriteGuard<'a> {
434+
impl WriteGuard<'_> {
435435
/// Loads the current [`RouteList`].
436436
#[inline]
437437
pub fn routes(&self) -> RouteListReadGuard {

mycelium/src/routing_table/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl<'a> RoutingTableIter<'a> {
2121
}
2222
}
2323

24-
impl<'a> Iterator for RoutingTableIter<'a> {
24+
impl Iterator for RoutingTableIter<'_> {
2525
type Item = (Subnet, RouteListReadGuard);
2626

2727
fn next(&mut self) -> Option<Self::Item> {

mycelium/src/routing_table/iter_mut.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub struct RoutingTableIterMutEntry<'a, 'b> {
7878
cancellation_token: CancellationToken,
7979
}
8080

81-
impl<'a, 'b> RoutingTableIterMutEntry<'a, 'b> {
81+
impl RoutingTableIterMutEntry<'_, '_> {
8282
pub fn update_routes<F: FnMut(&mut RouteList, &mpsc::Sender<RouteKey>, &CancellationToken)>(
8383
&mut self,
8484
mut op: F,

0 commit comments

Comments
 (0)