Skip to content

Commit 30b021e

Browse files
authored
fix: clippy lint updates for rust version 1.89.0 (#2750)
1 parent c64faf9 commit 30b021e

File tree

60 files changed

+124
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+124
-118
lines changed

common/s2n-codec/src/decoder/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ macro_rules! impl_buffer {
227227
// TODO add doctest
228228

229229
#[inline]
230-
pub fn get_checked_range(&self, range: &crate::CheckedRange) -> DecoderBuffer {
230+
pub fn get_checked_range(&self, range: &crate::CheckedRange) -> DecoderBuffer<'_> {
231231
range.get(self.bytes).into()
232232
}
233233
}
@@ -286,7 +286,7 @@ macro_rules! impl_buffer {
286286
pub fn peek_range(
287287
&self,
288288
range: core::ops::Range<usize>,
289-
) -> Result<crate::DecoderBuffer, DecoderError> {
289+
) -> Result<crate::DecoderBuffer<'_>, DecoderError> {
290290
let end = range.end;
291291
self.bytes
292292
.get(range)

dc/s2n-quic-dc-benches/src/datagram/recv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ macro_rules! impl_recv {
2828
#[allow(dead_code)]
2929
pub fn parse(
3030
buffer: &mut [u8],
31-
) -> Option<s2n_quic_dc::packet::datagram::decoder::Packet> {
31+
) -> Option<s2n_quic_dc::packet::datagram::decoder::Packet<'_>> {
3232
let buffer = s2n_codec::DecoderBufferMut::new(buffer);
3333
let (packet, _buffer) = s2n_quic_dc::packet::datagram::decoder::Packet::decode(
3434
buffer,

dc/s2n-quic-dc/src/msg/send.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ impl Message {
325325
}
326326

327327
#[inline]
328-
pub fn drain(&mut self) -> Drain {
328+
pub fn drain(&mut self) -> Drain<'_> {
329329
Drain {
330330
message: self,
331331
index: 0,

dc/s2n-quic-dc/src/packet/control/decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl Packet<'_> {
130130
}
131131

132132
#[inline]
133-
pub fn control_frames_mut(&mut self) -> ControlFramesMut {
133+
pub fn control_frames_mut(&mut self) -> ControlFramesMut<'_> {
134134
ControlFramesMut {
135135
buffer: self.control_data.get_mut(self.header),
136136
}

dc/s2n-quic-dc/src/path/secret/map/state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ where
400400
self.ids = Default::default();
401401
}
402402

403-
pub(super) fn subscriber(&self) -> event::EndpointPublisherSubscriber<S> {
403+
pub(super) fn subscriber(&self) -> event::EndpointPublisherSubscriber<'_, S> {
404404
use event::IntoEvent as _;
405405

406406
let timestamp = self.clock.get_time().into_event();

dc/s2n-quic-dc/src/stream/environment.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub trait Environment {
3636

3737
/// Creates an endpoint publisher with the environment's subscriber
3838
#[inline]
39-
fn endpoint_publisher(&self) -> event::EndpointPublisherSubscriber<Self::Subscriber> {
39+
fn endpoint_publisher(&self) -> event::EndpointPublisherSubscriber<'_, Self::Subscriber> {
4040
use s2n_quic_core::time::Clock as _;
4141

4242
self.endpoint_publisher_with_time(self.clock().get_time())
@@ -46,7 +46,7 @@ pub trait Environment {
4646
fn endpoint_publisher_with_time(
4747
&self,
4848
timestamp: Timestamp,
49-
) -> event::EndpointPublisherSubscriber<Self::Subscriber> {
49+
) -> event::EndpointPublisherSubscriber<'_, Self::Subscriber> {
5050
use s2n_quic_core::event::IntoEvent;
5151

5252
let timestamp = timestamp.into_event();

dc/s2n-quic-dc/src/stream/recv/dispatch/queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ impl<T> Queue<T> {
299299
}
300300

301301
#[inline]
302-
fn lock(&self) -> Result<std::sync::MutexGuard<Inner<T>>, Closed> {
302+
fn lock(&self) -> Result<std::sync::MutexGuard<'_, Inner<T>>, Closed> {
303303
self.inner.lock().map_err(|_| Closed)
304304
}
305305
}

dc/s2n-quic-dc/src/stream/recv/shared.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl State {
208208
}
209209

210210
#[inline]
211-
pub fn worker_try_lock(&self) -> io::Result<Option<MutexGuard<Inner>>> {
211+
pub fn worker_try_lock(&self) -> io::Result<Option<MutexGuard<'_, Inner>>> {
212212
match self.inner.try_lock() {
213213
Ok(lock) => Ok(Some(lock)),
214214
Err(std::sync::TryLockError::WouldBlock) => Ok(None),

dc/s2n-quic-dc/src/stream/shared.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,23 +207,23 @@ where
207207
}
208208

209209
#[inline]
210-
pub fn publisher(&self) -> event::ConnectionPublisherSubscriber<Sub> {
210+
pub fn publisher(&self) -> event::ConnectionPublisherSubscriber<'_, Sub> {
211211
self.publisher_with_timestamp(self.clock.get_time())
212212
}
213213

214214
#[inline]
215215
pub fn publisher_with_timestamp(
216216
&self,
217217
timestamp: Timestamp,
218-
) -> event::ConnectionPublisherSubscriber<Sub> {
218+
) -> event::ConnectionPublisherSubscriber<'_, Sub> {
219219
self.subscriber.publisher(timestamp)
220220
}
221221

222222
#[inline]
223223
pub fn endpoint_publisher(
224224
&self,
225225
timestamp: Timestamp,
226-
) -> event::EndpointPublisherSubscriber<Sub> {
226+
) -> event::EndpointPublisherSubscriber<'_, Sub> {
227227
self.subscriber.endpoint_publisher(timestamp)
228228
}
229229
}
@@ -241,7 +241,7 @@ where
241241
Sub: event::Subscriber,
242242
{
243243
#[inline]
244-
pub fn publisher(&self, timestamp: Timestamp) -> event::ConnectionPublisherSubscriber<Sub> {
244+
pub fn publisher(&self, timestamp: Timestamp) -> event::ConnectionPublisherSubscriber<'_, Sub> {
245245
event::ConnectionPublisherSubscriber::new(
246246
event::builder::ConnectionMeta {
247247
id: 0, // TODO
@@ -257,7 +257,7 @@ where
257257
pub fn endpoint_publisher(
258258
&self,
259259
timestamp: Timestamp,
260-
) -> event::EndpointPublisherSubscriber<Sub> {
260+
) -> event::EndpointPublisherSubscriber<'_, Sub> {
261261
event::EndpointPublisherSubscriber::new(
262262
event::builder::EndpointMeta {
263263
timestamp: timestamp.into_event(),

dc/s2n-quic-dc/src/sync/ring_deque.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,14 +225,14 @@ impl<T, W: RecvWaker> RingDeque<T, W> {
225225
}
226226

227227
#[inline]
228-
fn lock(&self) -> Result<std::sync::MutexGuard<Inner<T, W>>, Closed> {
228+
fn lock(&self) -> Result<std::sync::MutexGuard<'_, Inner<T, W>>, Closed> {
229229
let inner = self.inner.lock().unwrap();
230230
ensure!(inner.open, Err(Closed));
231231
Ok(inner)
232232
}
233233

234234
#[inline]
235-
fn try_lock(&self) -> Result<Option<std::sync::MutexGuard<Inner<T, W>>>, Closed> {
235+
fn try_lock(&self) -> Result<Option<std::sync::MutexGuard<'_, Inner<T, W>>>, Closed> {
236236
use std::sync::TryLockError;
237237
let inner = match self.inner.try_lock() {
238238
Ok(inner) => inner,

0 commit comments

Comments
 (0)