From 06a004d7abe4e437eac857a16dcb2e4677b008a8 Mon Sep 17 00:00:00 2001 From: Cameron Bytheway Date: Mon, 2 Dec 2024 17:28:55 -0700 Subject: [PATCH] build: address clippy issues from 1.83 (#2393) --- common/s2n-codec/src/encoder/buffer.rs | 2 +- common/s2n-codec/src/encoder/scatter.rs | 2 +- dc/s2n-quic-dc/src/event/generated.rs | 1 + dc/s2n-quic-dc/src/msg/send.rs | 2 +- dc/s2n-quic-dc/src/packet.rs | 4 ++-- dc/s2n-quic-dc/src/packet/control/decoder.rs | 2 +- dc/s2n-quic-dc/src/packet/datagram/decoder.rs | 4 ++-- dc/s2n-quic-dc/src/packet/secret_control.rs | 2 +- .../src/packet/secret_control/decoder.rs | 7 +++++-- .../secret_control/unknown_path_secret.rs | 2 +- dc/s2n-quic-dc/src/packet/stream/decoder.rs | 4 ++-- dc/s2n-quic-dc/src/path/secret/receiver.rs | 4 ++-- dc/s2n-quic-dc/src/stream/recv/packet.rs | 4 ++-- dc/s2n-quic-dc/src/stream/recv/shared.rs | 8 ++++---- .../stream/send/application/transmission.rs | 2 +- dc/s2n-quic-dc/src/stream/send/queue.rs | 2 +- dc/s2n-quic-dc/src/stream/socket/handle.rs | 2 +- dc/s2n-quic-dc/src/sync/channel.rs | 2 +- quic/s2n-quic-bench/src/xdp.rs | 2 +- quic/s2n-quic-core/src/application/error.rs | 2 +- .../src/buffer/duplex/interposer.rs | 6 +++--- .../s2n-quic-core/src/buffer/reader/checked.rs | 4 ++-- .../src/buffer/reader/complete.rs | 4 ++-- quic/s2n-quic-core/src/buffer/reader/empty.rs | 4 ++-- .../src/buffer/reader/incremental.rs | 6 +++--- quic/s2n-quic-core/src/buffer/reader/limit.rs | 4 ++-- .../src/buffer/reader/storage/buf.rs | 4 ++-- .../src/buffer/reader/storage/chunk.rs | 14 +++++++------- .../src/buffer/reader/storage/full_copy.rs | 2 +- .../src/buffer/reader/storage/io_slice.rs | 4 ++-- .../src/buffer/reader/storage/tracked.rs | 4 ++-- .../s2n-quic-core/src/buffer/reader/testing.rs | 4 ++-- quic/s2n-quic-core/src/buffer/reassembler.rs | 2 +- .../src/buffer/reassembler/request.rs | 6 +++--- .../src/buffer/writer/storage/buf.rs | 2 +- .../src/buffer/writer/storage/limit.rs | 2 +- .../src/buffer/writer/storage/tracked.rs | 2 +- .../src/buffer/writer/storage/write_once.rs | 2 +- quic/s2n-quic-core/src/connection/error.rs | 2 +- quic/s2n-quic-core/src/crypto/payload.rs | 4 ++-- quic/s2n-quic-core/src/endpoint/mod.rs | 2 +- quic/s2n-quic-core/src/event/generated.rs | 1 + quic/s2n-quic-core/src/frame/ack.rs | 10 +++++----- .../src/frame/connection_close.rs | 6 +++--- .../src/frame/dc_stateless_reset_tokens.rs | 2 +- .../src/frame/new_connection_id.rs | 4 ++-- quic/s2n-quic-core/src/frame/new_token.rs | 4 ++-- quic/s2n-quic-core/src/frame/path_challenge.rs | 4 ++-- quic/s2n-quic-core/src/frame/path_response.rs | 4 ++-- quic/s2n-quic-core/src/havoc.rs | 2 +- quic/s2n-quic-core/src/inet/ip.rs | 6 +++--- quic/s2n-quic-core/src/interval_set/mod.rs | 4 ++-- quic/s2n-quic-core/src/io/rx/pair.rs | 2 +- quic/s2n-quic-core/src/io/testing.rs | 4 ++-- quic/s2n-quic-core/src/io/tx/handle_map.rs | 2 +- quic/s2n-quic-core/src/io/tx/router.rs | 2 +- quic/s2n-quic-core/src/packet/handshake.rs | 2 +- quic/s2n-quic-core/src/packet/initial.rs | 2 +- quic/s2n-quic-core/src/packet/long.rs | 4 ++-- quic/s2n-quic-core/src/packet/number/map.rs | 4 ++-- quic/s2n-quic-core/src/packet/retry.rs | 4 ++-- quic/s2n-quic-core/src/packet/short.rs | 2 +- .../src/packet/version_negotiation.rs | 6 ++---- quic/s2n-quic-core/src/packet/zero_rtt.rs | 2 +- quic/s2n-quic-core/src/path/mod.rs | 2 +- .../src/recovery/congestion_controller.rs | 2 +- quic/s2n-quic-core/src/stream/error.rs | 2 +- quic/s2n-quic-core/src/stream/ops.rs | 2 +- quic/s2n-quic-core/src/sync/spsc/recv.rs | 6 +++--- quic/s2n-quic-core/src/sync/spsc/send.rs | 6 +++--- quic/s2n-quic-core/src/sync/spsc/slice.rs | 4 ++-- quic/s2n-quic-core/src/sync/worker.rs | 2 +- quic/s2n-quic-core/src/task/cooldown.rs | 2 +- quic/s2n-quic-core/src/time/clock.rs | 2 +- .../src/transmission/writer/testing.rs | 2 +- quic/s2n-quic-core/src/transport/error.rs | 2 +- quic/s2n-quic-core/src/xdp/encoder.rs | 2 +- quic/s2n-quic-events/src/output.rs | 2 ++ quic/s2n-quic-platform/src/bpf/program.rs | 4 ++-- quic/s2n-quic-platform/src/message.rs | 2 +- .../src/message/cmsg/storage.rs | 6 +++--- quic/s2n-quic-platform/src/message/msg/ext.rs | 2 +- quic/s2n-quic-platform/src/socket/io/rx.rs | 2 +- quic/s2n-quic-platform/src/socket/io/tx.rs | 6 +++--- quic/s2n-quic-sim/src/run/range.rs | 2 +- quic/s2n-quic-sim/src/stats.rs | 2 +- .../src/connection/close_sender.rs | 4 ++-- .../src/connection/transmission.rs | 4 ++-- .../src/recovery/manager/tests.rs | 2 +- .../src/space/application.rs | 6 +++--- quic/s2n-quic-transport/src/space/datagram.rs | 2 +- quic/s2n-quic-transport/src/space/handshake.rs | 2 +- quic/s2n-quic-transport/src/space/initial.rs | 2 +- quic/s2n-quic-transport/src/space/mod.rs | 3 +-- .../src/space/session_context.rs | 8 +++----- quic/s2n-quic-transport/src/stream/api.rs | 12 ++++++------ .../src/stream/stream_interests.rs | 2 +- .../src/sync/data_sender/buffer.rs | 2 +- .../src/sync/data_sender/transmissions.rs | 2 +- .../src/transmission/application.rs | 18 ++++++++---------- .../src/transmission/connection_close.rs | 4 ++-- .../src/transmission/context.rs | 6 +++--- .../src/transmission/early.rs | 4 ++-- .../s2n-quic-transport/src/transmission/mod.rs | 8 ++++---- 104 files changed, 191 insertions(+), 191 deletions(-) diff --git a/common/s2n-codec/src/encoder/buffer.rs b/common/s2n-codec/src/encoder/buffer.rs index f333b0bfd1..08f28eb7b9 100644 --- a/common/s2n-codec/src/encoder/buffer.rs +++ b/common/s2n-codec/src/encoder/buffer.rs @@ -70,7 +70,7 @@ impl<'a> EncoderBuffer<'a> { } } -impl<'a> Encoder for EncoderBuffer<'a> { +impl Encoder for EncoderBuffer<'_> { #[inline] fn write_sized(&mut self, len: usize, write: F) { self.assert_capacity(len); diff --git a/common/s2n-codec/src/encoder/scatter.rs b/common/s2n-codec/src/encoder/scatter.rs index bfcb533739..70c3ef2cb6 100644 --- a/common/s2n-codec/src/encoder/scatter.rs +++ b/common/s2n-codec/src/encoder/scatter.rs @@ -100,7 +100,7 @@ impl<'a> Buffer<'a> { fn flush(&mut self) {} } -impl<'a> Encoder for Buffer<'a> { +impl Encoder for Buffer<'_> { /// We have special handling for writes that include `Bytes` so signal that #[cfg(feature = "bytes")] const SPECIALIZES_BYTES: bool = true; diff --git a/dc/s2n-quic-dc/src/event/generated.rs b/dc/s2n-quic-dc/src/event/generated.rs index 86f4e147de..d64c8cebd8 100644 --- a/dc/s2n-quic-dc/src/event/generated.rs +++ b/dc/s2n-quic-dc/src/event/generated.rs @@ -5,6 +5,7 @@ // This file was generated with the `s2n-quic-events` crate and any required // changes should be made there. +#![allow(clippy::needless_lifetimes)] use super::*; pub(crate) mod metrics; pub mod api { diff --git a/dc/s2n-quic-dc/src/msg/send.rs b/dc/s2n-quic-dc/src/msg/send.rs index c4e011e242..de0f35e02d 100644 --- a/dc/s2n-quic-dc/src/msg/send.rs +++ b/dc/s2n-quic-dc/src/msg/send.rs @@ -607,7 +607,7 @@ impl<'a> Iterator for Drain<'a> { } } -impl<'a> Drop for Drain<'a> { +impl Drop for Drain<'_> { #[inline] fn drop(&mut self) { self.message.force_clear(); diff --git a/dc/s2n-quic-dc/src/packet.rs b/dc/s2n-quic-dc/src/packet.rs index ed143fdcf9..aa3ac3ca00 100644 --- a/dc/s2n-quic-dc/src/packet.rs +++ b/dc/s2n-quic-dc/src/packet.rs @@ -40,7 +40,7 @@ pub enum Packet<'a> { UnknownPathSecret(secret_control::unknown_path_secret::Packet<'a>), } -impl<'a> Packet<'a> { +impl Packet<'_> { #[inline] pub fn kind(&self) -> Kind { match self { @@ -61,7 +61,7 @@ impl<'a> s2n_codec::DecoderParameterizedValueMut<'a> for Packet<'a> { fn decode_parameterized_mut( tag_len: Self::Parameter, decoder: DecoderBufferMut<'a>, - ) -> s2n_codec::DecoderBufferMutResult { + ) -> s2n_codec::DecoderBufferMutResult<'a, Self> { match decoder.peek().decode().map(|(tag, _)| tag)? { Tag::Control(_) => { let (packet, decoder) = control::decoder::Packet::decode(decoder, (), tag_len)?; diff --git a/dc/s2n-quic-dc/src/packet/control/decoder.rs b/dc/s2n-quic-dc/src/packet/control/decoder.rs index aa4152de49..c88894a843 100644 --- a/dc/s2n-quic-dc/src/packet/control/decoder.rs +++ b/dc/s2n-quic-dc/src/packet/control/decoder.rs @@ -58,7 +58,7 @@ pub struct Packet<'a> { auth_tag: &'a mut [u8], } -impl<'a> Packet<'a> { +impl Packet<'_> { #[inline] pub fn tag(&self) -> Tag { self.tag diff --git a/dc/s2n-quic-dc/src/packet/datagram/decoder.rs b/dc/s2n-quic-dc/src/packet/datagram/decoder.rs index 0e5b092f37..673e2cb089 100644 --- a/dc/s2n-quic-dc/src/packet/datagram/decoder.rs +++ b/dc/s2n-quic-dc/src/packet/datagram/decoder.rs @@ -58,7 +58,7 @@ pub struct Packet<'a> { auth_tag: &'a mut [u8], } -impl<'a> std::fmt::Debug for Packet<'a> { +impl std::fmt::Debug for Packet<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.debug_struct("Packet") .field("tag", &self.tag) @@ -79,7 +79,7 @@ impl<'a> std::fmt::Debug for Packet<'a> { } } -impl<'a> Packet<'a> { +impl Packet<'_> { #[inline] pub fn tag(&self) -> Tag { self.tag diff --git a/dc/s2n-quic-dc/src/packet/secret_control.rs b/dc/s2n-quic-dc/src/packet/secret_control.rs index 62b4d40061..1d2cfdb640 100644 --- a/dc/s2n-quic-dc/src/packet/secret_control.rs +++ b/dc/s2n-quic-dc/src/packet/secret_control.rs @@ -133,7 +133,7 @@ pub enum Packet<'a> { impl<'a> Packet<'a> { #[inline] - pub fn decode(buffer: DecoderBufferMut<'a>) -> Rm { + pub fn decode(buffer: DecoderBufferMut<'a>) -> Rm<'a, Self> { let tag = buffer.peek_byte(0)?; Ok(match tag { diff --git a/dc/s2n-quic-dc/src/packet/secret_control/decoder.rs b/dc/s2n-quic-dc/src/packet/secret_control/decoder.rs index da8da8d4bd..8da1c326b6 100644 --- a/dc/s2n-quic-dc/src/packet/secret_control/decoder.rs +++ b/dc/s2n-quic-dc/src/packet/secret_control/decoder.rs @@ -16,7 +16,7 @@ macro_rules! impl_packet { impl<'a> Packet<'a> { #[inline] - pub fn decode(buffer: DecoderBufferMut<'a>) -> Rm { + pub fn decode(buffer: DecoderBufferMut<'a>) -> Rm<'a, Self> { let header_len = decoder::header_len::<$name>(buffer.peek())?; let ((header, value, crypto_tag), buffer) = decoder::header(buffer, header_len)?; let packet = Self { @@ -62,7 +62,10 @@ where } #[inline] -pub fn header<'a, T>(buffer: DecoderBufferMut<'a>, header_len: usize) -> Rm<'a, (&[u8], T, &[u8])> +pub fn header<'a, T>( + buffer: DecoderBufferMut<'a>, + header_len: usize, +) -> Rm<'a, (&'a [u8], T, &'a [u8])> where T: DecoderValue<'a>, { diff --git a/dc/s2n-quic-dc/src/packet/secret_control/unknown_path_secret.rs b/dc/s2n-quic-dc/src/packet/secret_control/unknown_path_secret.rs index da8eb9c61a..e46218973d 100644 --- a/dc/s2n-quic-dc/src/packet/secret_control/unknown_path_secret.rs +++ b/dc/s2n-quic-dc/src/packet/secret_control/unknown_path_secret.rs @@ -27,7 +27,7 @@ impl<'a> Packet<'a> { } #[inline] - pub fn decode(buffer: DecoderBufferMut<'a>) -> Rm { + pub fn decode(buffer: DecoderBufferMut<'a>) -> Rm<'a, Self> { let header_len = decoder::header_len::(buffer.peek())?; let ((header, value, crypto_tag), buffer) = decoder::header(buffer, header_len)?; let packet = Self { diff --git a/dc/s2n-quic-dc/src/packet/stream/decoder.rs b/dc/s2n-quic-dc/src/packet/stream/decoder.rs index ecb43a7cf5..bc74554bb1 100644 --- a/dc/s2n-quic-dc/src/packet/stream/decoder.rs +++ b/dc/s2n-quic-dc/src/packet/stream/decoder.rs @@ -115,7 +115,7 @@ pub struct Packet<'a> { auth_tag: &'a mut [u8], } -impl<'a> fmt::Debug for Packet<'a> { +impl fmt::Debug for Packet<'_> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.debug_struct("stream::Packet") .field("tag", &self.tag) @@ -134,7 +134,7 @@ impl<'a> fmt::Debug for Packet<'a> { } } -impl<'a> Packet<'a> { +impl Packet<'_> { #[inline] pub fn tag(&self) -> Tag { self.tag diff --git a/dc/s2n-quic-dc/src/path/secret/receiver.rs b/dc/s2n-quic-dc/src/path/secret/receiver.rs index c7a8502fbb..41e413dac2 100644 --- a/dc/s2n-quic-dc/src/path/secret/receiver.rs +++ b/dc/s2n-quic-dc/src/path/secret/receiver.rs @@ -90,7 +90,7 @@ struct SharedSlotGuard<'a> { key_id: u64, } -impl<'a> SharedSlotGuard<'a> { +impl SharedSlotGuard<'_> { fn write_id(&mut self, id: Id) { // Store the new ID. // SAFETY: We hold the lock since we are in the guard. @@ -109,7 +109,7 @@ impl<'a> SharedSlotGuard<'a> { } } -impl<'a> Drop for SharedSlotGuard<'a> { +impl Drop for SharedSlotGuard<'_> { fn drop(&mut self) { self.slot.key_id.store(self.key_id, Ordering::Release); } diff --git a/dc/s2n-quic-dc/src/stream/recv/packet.rs b/dc/s2n-quic-dc/src/stream/recv/packet.rs index 5a5c0d99e7..6538f9b39f 100644 --- a/dc/s2n-quic-dc/src/stream/recv/packet.rs +++ b/dc/s2n-quic-dc/src/stream/recv/packet.rs @@ -31,7 +31,7 @@ where pub receiver: &'a mut Receiver, } -impl<'a, 'p, D, K, C: Clock> reader::Storage for Packet<'a, 'p, D, K, C> +impl reader::Storage for Packet<'_, '_, D, K, C> where D: crypto::open::Application, K: crypto::open::control::Stream, @@ -114,7 +114,7 @@ where } } -impl<'a, 'p, D, K, C: Clock> Reader for Packet<'a, 'p, D, K, C> +impl Reader for Packet<'_, '_, D, K, C> where D: crypto::open::Application, K: crypto::open::control::Stream, diff --git a/dc/s2n-quic-dc/src/stream/recv/shared.rs b/dc/s2n-quic-dc/src/stream/recv/shared.rs index 7dfa367f8f..3e58f8b90f 100644 --- a/dc/s2n-quic-dc/src/stream/recv/shared.rs +++ b/dc/s2n-quic-dc/src/stream/recv/shared.rs @@ -183,7 +183,7 @@ where initial_state: state::Receiver, } -impl<'a, Sub> AppGuard<'a, Sub> +impl AppGuard<'_, Sub> where Sub: event::Subscriber, { @@ -223,7 +223,7 @@ where } } -impl<'a, Sub> ops::Deref for AppGuard<'a, Sub> +impl ops::Deref for AppGuard<'_, Sub> where Sub: event::Subscriber, { @@ -235,7 +235,7 @@ where } } -impl<'a, Sub> ops::DerefMut for AppGuard<'a, Sub> +impl ops::DerefMut for AppGuard<'_, Sub> where Sub: event::Subscriber, { @@ -245,7 +245,7 @@ where } } -impl<'a, Sub> Drop for AppGuard<'a, Sub> +impl Drop for AppGuard<'_, Sub> where Sub: event::Subscriber, { diff --git a/dc/s2n-quic-dc/src/stream/send/application/transmission.rs b/dc/s2n-quic-dc/src/stream/send/application/transmission.rs index 4549337c9c..017ae61359 100644 --- a/dc/s2n-quic-dc/src/stream/send/application/transmission.rs +++ b/dc/s2n-quic-dc/src/stream/send/application/transmission.rs @@ -59,7 +59,7 @@ pub struct Drain<'a, Buffer> { queue: &'a Queue, } -impl<'a, Buffer> Iterator for Drain<'a, Buffer> { +impl Iterator for Drain<'_, Buffer> { type Item = Event; #[inline] diff --git a/dc/s2n-quic-dc/src/stream/send/queue.rs b/dc/s2n-quic-dc/src/stream/send/queue.rs index aed2ddde55..e5caef531a 100644 --- a/dc/s2n-quic-dc/src/stream/send/queue.rs +++ b/dc/s2n-quic-dc/src/stream/send/queue.rs @@ -40,7 +40,7 @@ pub struct Message<'a> { segment_alloc: &'a buffer::Allocator, } -impl<'a> application::state::Message for Message<'a> { +impl application::state::Message for Message<'_> { #[inline] fn max_segments(&self) -> usize { self.max_segments diff --git a/dc/s2n-quic-dc/src/stream/socket/handle.rs b/dc/s2n-quic-dc/src/stream/socket/handle.rs index 5eb4a69693..32988dfa7c 100644 --- a/dc/s2n-quic-dc/src/stream/socket/handle.rs +++ b/dc/s2n-quic-dc/src/stream/socket/handle.rs @@ -104,7 +104,7 @@ pub struct ExtRecvBuffer<'a, T: Socket + ?Sized> { msg: &'a mut msg::recv::Message, } -impl<'a, T: Socket> core::future::Future for ExtRecvBuffer<'a, T> { +impl core::future::Future for ExtRecvBuffer<'_, T> { type Output = io::Result; fn poll(mut self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { diff --git a/dc/s2n-quic-dc/src/sync/channel.rs b/dc/s2n-quic-dc/src/sync/channel.rs index a3141e67fd..c22b81bf7e 100644 --- a/dc/s2n-quic-dc/src/sync/channel.rs +++ b/dc/s2n-quic-dc/src/sync/channel.rs @@ -285,7 +285,7 @@ pin_project! { } } -impl<'a, T> EventListenerFuture for RecvInner<'a, T> { +impl EventListenerFuture for RecvInner<'_, T> { type Output = Result; /// Run this future with the given `Strategy`. diff --git a/quic/s2n-quic-bench/src/xdp.rs b/quic/s2n-quic-bench/src/xdp.rs index d0707a0c6a..f78a706228 100644 --- a/quic/s2n-quic-bench/src/xdp.rs +++ b/quic/s2n-quic-bench/src/xdp.rs @@ -108,7 +108,7 @@ struct Message { payload_len: usize, } -impl<'a> tx::Message for &'a Message { +impl tx::Message for &Message { type Handle = path::Tuple; fn path_handle(&self) -> &Self::Handle { diff --git a/quic/s2n-quic-core/src/application/error.rs b/quic/s2n-quic-core/src/application/error.rs index c208ad6479..3a46554e52 100644 --- a/quic/s2n-quic-core/src/application/error.rs +++ b/quic/s2n-quic-core/src/application/error.rs @@ -79,7 +79,7 @@ impl From for u64 { } } -impl<'a> From for ConnectionClose<'a> { +impl From for ConnectionClose<'_> { fn from(error: Error) -> Self { ConnectionClose { error_code: error.0, diff --git a/quic/s2n-quic-core/src/buffer/duplex/interposer.rs b/quic/s2n-quic-core/src/buffer/duplex/interposer.rs index 153da8cb76..2257143f60 100644 --- a/quic/s2n-quic-core/src/buffer/duplex/interposer.rs +++ b/quic/s2n-quic-core/src/buffer/duplex/interposer.rs @@ -43,7 +43,7 @@ where } /// Delegates to the inner Duplex -impl<'a, S, D> reader::Storage for Interposer<'a, S, D> +impl reader::Storage for Interposer<'_, S, D> where S: writer::Storage + ?Sized, D: duplex::Skip + ?Sized, @@ -86,7 +86,7 @@ where } /// Delegates to the inner Duplex -impl<'a, C, D> Reader for Interposer<'a, C, D> +impl Reader for Interposer<'_, C, D> where C: writer::Storage + ?Sized, D: duplex::Skip + ?Sized, @@ -112,7 +112,7 @@ where } } -impl<'a, C, D> Writer for Interposer<'a, C, D> +impl Writer for Interposer<'_, C, D> where C: writer::Storage + ?Sized, D: duplex::Skip + ?Sized, diff --git a/quic/s2n-quic-core/src/buffer/reader/checked.rs b/quic/s2n-quic-core/src/buffer/reader/checked.rs index 361c457e08..0592b3c2d9 100644 --- a/quic/s2n-quic-core/src/buffer/reader/checked.rs +++ b/quic/s2n-quic-core/src/buffer/reader/checked.rs @@ -80,7 +80,7 @@ where } #[cfg(debug_assertions)] -impl<'a, R> Storage for Checked<'a, R> +impl Storage for Checked<'_, R> where R: Reader + ?Sized, { @@ -149,7 +149,7 @@ where } } -impl<'a, R> Reader for Checked<'a, R> +impl Reader for Checked<'_, R> where R: Reader + ?Sized, { diff --git a/quic/s2n-quic-core/src/buffer/reader/complete.rs b/quic/s2n-quic-core/src/buffer/reader/complete.rs index 4dca4b8e3a..9572b0497f 100644 --- a/quic/s2n-quic-core/src/buffer/reader/complete.rs +++ b/quic/s2n-quic-core/src/buffer/reader/complete.rs @@ -36,7 +36,7 @@ where } } -impl<'a, S> Storage for Complete<'a, S> +impl Storage for Complete<'_, S> where S: Storage, { @@ -83,7 +83,7 @@ where } } -impl<'a, C> Reader for Complete<'a, C> +impl Reader for Complete<'_, C> where C: Storage, { diff --git a/quic/s2n-quic-core/src/buffer/reader/empty.rs b/quic/s2n-quic-core/src/buffer/reader/empty.rs index 26d927914f..11f15a2601 100644 --- a/quic/s2n-quic-core/src/buffer/reader/empty.rs +++ b/quic/s2n-quic-core/src/buffer/reader/empty.rs @@ -20,7 +20,7 @@ impl<'a, R: Reader + ?Sized> Empty<'a, R> { } } -impl<'a, R: Reader + ?Sized> Storage for Empty<'a, R> { +impl Storage for Empty<'_, R> { type Error = core::convert::Infallible; #[inline(always)] @@ -42,7 +42,7 @@ impl<'a, R: Reader + ?Sized> Storage for Empty<'a, R> { } } -impl<'a, R: Reader + ?Sized> Reader for Empty<'a, R> { +impl Reader for Empty<'_, R> { #[inline] fn current_offset(&self) -> VarInt { self.0.current_offset() diff --git a/quic/s2n-quic-core/src/buffer/reader/incremental.rs b/quic/s2n-quic-core/src/buffer/reader/incremental.rs index 525afa5c7e..1440063ffd 100644 --- a/quic/s2n-quic-core/src/buffer/reader/incremental.rs +++ b/quic/s2n-quic-core/src/buffer/reader/incremental.rs @@ -68,7 +68,7 @@ pub struct WithStorage<'a, C: Storage> { storage: &'a mut C, } -impl<'a, C: Storage> WithStorage<'a, C> { +impl WithStorage<'_, C> { #[inline] pub fn set_fin(&mut self) -> Result<&mut Self, Error> { let final_offset = self @@ -88,7 +88,7 @@ impl<'a, C: Storage> WithStorage<'a, C> { } } -impl<'a, C: Storage> Storage for WithStorage<'a, C> { +impl Storage for WithStorage<'_, C> { type Error = C::Error; #[inline] @@ -127,7 +127,7 @@ impl<'a, C: Storage> Storage for WithStorage<'a, C> { } } -impl<'a, C: Storage> Reader for WithStorage<'a, C> { +impl Reader for WithStorage<'_, C> { #[inline] fn current_offset(&self) -> VarInt { self.incremental.current_offset() diff --git a/quic/s2n-quic-core/src/buffer/reader/limit.rs b/quic/s2n-quic-core/src/buffer/reader/limit.rs index 0c8736c3c1..ba0d40b25b 100644 --- a/quic/s2n-quic-core/src/buffer/reader/limit.rs +++ b/quic/s2n-quic-core/src/buffer/reader/limit.rs @@ -26,7 +26,7 @@ impl<'a, R: Reader + ?Sized> Limit<'a, R> { } } -impl<'a, R: Reader + ?Sized> Storage for Limit<'a, R> { +impl Storage for Limit<'_, R> { type Error = R::Error; #[inline] @@ -78,7 +78,7 @@ impl<'a, R: Reader + ?Sized> Storage for Limit<'a, R> { } } -impl<'a, R: Reader + ?Sized> Reader for Limit<'a, R> { +impl Reader for Limit<'_, R> { #[inline] fn current_offset(&self) -> VarInt { self.reader.current_offset() diff --git a/quic/s2n-quic-core/src/buffer/reader/storage/buf.rs b/quic/s2n-quic-core/src/buffer/reader/storage/buf.rs index 3078d80e57..b5cfb8b730 100644 --- a/quic/s2n-quic-core/src/buffer/reader/storage/buf.rs +++ b/quic/s2n-quic-core/src/buffer/reader/storage/buf.rs @@ -40,7 +40,7 @@ where } } -impl<'a, B> Storage for Buf<'a, B> +impl Storage for Buf<'_, B> where B: bytes::Buf, { @@ -136,7 +136,7 @@ where } } -impl<'a, B> Drop for Buf<'a, B> +impl Drop for Buf<'_, B> where B: bytes::Buf, { diff --git a/quic/s2n-quic-core/src/buffer/reader/storage/chunk.rs b/quic/s2n-quic-core/src/buffer/reader/storage/chunk.rs index 52a26076d1..27b65d005e 100644 --- a/quic/s2n-quic-core/src/buffer/reader/storage/chunk.rs +++ b/quic/s2n-quic-core/src/buffer/reader/storage/chunk.rs @@ -15,14 +15,14 @@ pub enum Chunk<'a> { BytesMut(BytesMut), } -impl<'a> Default for Chunk<'a> { +impl Default for Chunk<'_> { #[inline] fn default() -> Self { Self::empty() } } -impl<'a> Chunk<'a> { +impl Chunk<'_> { #[inline] pub fn empty() -> Self { Self::Slice(&[]) @@ -36,21 +36,21 @@ impl<'a> From<&'a [u8]> for Chunk<'a> { } } -impl<'a> From for Chunk<'a> { +impl From for Chunk<'_> { #[inline] fn from(chunk: Bytes) -> Self { Self::Bytes(chunk) } } -impl<'a> From for Chunk<'a> { +impl From for Chunk<'_> { #[inline] fn from(chunk: BytesMut) -> Self { Self::BytesMut(chunk) } } -impl<'a> core::ops::Deref for Chunk<'a> { +impl core::ops::Deref for Chunk<'_> { type Target = [u8]; #[inline] @@ -63,14 +63,14 @@ impl<'a> core::ops::Deref for Chunk<'a> { } } -impl<'a> AsRef<[u8]> for Chunk<'a> { +impl AsRef<[u8]> for Chunk<'_> { #[inline] fn as_ref(&self) -> &[u8] { self } } -impl<'a> Storage for Chunk<'a> { +impl Storage for Chunk<'_> { type Error = core::convert::Infallible; #[inline] diff --git a/quic/s2n-quic-core/src/buffer/reader/storage/full_copy.rs b/quic/s2n-quic-core/src/buffer/reader/storage/full_copy.rs index 224abb42d2..fd291c2125 100644 --- a/quic/s2n-quic-core/src/buffer/reader/storage/full_copy.rs +++ b/quic/s2n-quic-core/src/buffer/reader/storage/full_copy.rs @@ -17,7 +17,7 @@ impl<'a, S: Storage + ?Sized> FullCopy<'a, S> { } } -impl<'a, S: Storage + ?Sized> Storage for FullCopy<'a, S> { +impl Storage for FullCopy<'_, S> { type Error = S::Error; #[inline] diff --git a/quic/s2n-quic-core/src/buffer/reader/storage/io_slice.rs b/quic/s2n-quic-core/src/buffer/reader/storage/io_slice.rs index ec2513694b..90a6f46783 100644 --- a/quic/s2n-quic-core/src/buffer/reader/storage/io_slice.rs +++ b/quic/s2n-quic-core/src/buffer/reader/storage/io_slice.rs @@ -150,7 +150,7 @@ where } } -impl<'a, T> bytes::Buf for IoSlice<'a, T> +impl bytes::Buf for IoSlice<'_, T> where T: core::ops::Deref, { @@ -200,7 +200,7 @@ where } } -impl<'a, T> Storage for IoSlice<'a, T> +impl Storage for IoSlice<'_, T> where T: core::ops::Deref, { diff --git a/quic/s2n-quic-core/src/buffer/reader/storage/tracked.rs b/quic/s2n-quic-core/src/buffer/reader/storage/tracked.rs index d9ca7cb393..8375c81367 100644 --- a/quic/s2n-quic-core/src/buffer/reader/storage/tracked.rs +++ b/quic/s2n-quic-core/src/buffer/reader/storage/tracked.rs @@ -26,7 +26,7 @@ impl<'a, S: Storage + ?Sized> Tracked<'a, S> { } } -impl<'a, S: Storage + ?Sized> Storage for Tracked<'a, S> { +impl Storage for Tracked<'_, S> { type Error = S::Error; #[inline] @@ -65,7 +65,7 @@ impl<'a, S: Storage + ?Sized> Storage for Tracked<'a, S> { } } -impl<'a, S: Reader + ?Sized> Reader for Tracked<'a, S> { +impl Reader for Tracked<'_, S> { #[inline] fn current_offset(&self) -> crate::varint::VarInt { self.storage.current_offset() diff --git a/quic/s2n-quic-core/src/buffer/reader/testing.rs b/quic/s2n-quic-core/src/buffer/reader/testing.rs index 7b757226de..ada7273ac6 100644 --- a/quic/s2n-quic-core/src/buffer/reader/testing.rs +++ b/quic/s2n-quic-core/src/buffer/reader/testing.rs @@ -44,7 +44,7 @@ where } } -impl<'a, R, E> Storage for Fallible<'a, R, E> +impl Storage for Fallible<'_, R, E> where R: ?Sized + Storage, E: 'static + Clone, @@ -92,7 +92,7 @@ where } } -impl<'a, R, E> Reader for Fallible<'a, R, E> +impl Reader for Fallible<'_, R, E> where R: ?Sized + Reader, E: 'static + Clone, diff --git a/quic/s2n-quic-core/src/buffer/reassembler.rs b/quic/s2n-quic-core/src/buffer/reassembler.rs index 343acb8b25..28f1f60bfe 100644 --- a/quic/s2n-quic-core/src/buffer/reassembler.rs +++ b/quic/s2n-quic-core/src/buffer/reassembler.rs @@ -720,7 +720,7 @@ pub struct Drain<'a> { inner: &'a mut Reassembler, } -impl<'a> Iterator for Drain<'a> { +impl Iterator for Drain<'_> { type Item = BytesMut; #[inline] diff --git a/quic/s2n-quic-core/src/buffer/reassembler/request.rs b/quic/s2n-quic-core/src/buffer/reassembler/request.rs index 426d846931..1fa71b651c 100644 --- a/quic/s2n-quic-core/src/buffer/reassembler/request.rs +++ b/quic/s2n-quic-core/src/buffer/reassembler/request.rs @@ -14,7 +14,7 @@ pub struct Request<'a> { is_fin: bool, } -impl<'a> fmt::Debug for Request<'a> { +impl fmt::Debug for Request<'_> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.debug_struct("Request") .field("offset", &self.offset) @@ -38,7 +38,7 @@ impl<'a> Request<'a> { } } -impl<'a> Reader for Request<'a> { +impl Reader for Request<'_> { #[inline] fn current_offset(&self) -> VarInt { unsafe { VarInt::new_unchecked(self.offset) } @@ -54,7 +54,7 @@ impl<'a> Reader for Request<'a> { } } -impl<'a> reader::Storage for Request<'a> { +impl reader::Storage for Request<'_> { type Error = core::convert::Infallible; #[inline] diff --git a/quic/s2n-quic-core/src/buffer/writer/storage/buf.rs b/quic/s2n-quic-core/src/buffer/writer/storage/buf.rs index b495809668..4afbd5e9f2 100644 --- a/quic/s2n-quic-core/src/buffer/writer/storage/buf.rs +++ b/quic/s2n-quic-core/src/buffer/writer/storage/buf.rs @@ -15,7 +15,7 @@ impl<'a, T: bytes::BufMut> BufMut<'a, T> { } } -impl<'a, T: bytes::BufMut> Storage for BufMut<'a, T> { +impl Storage for BufMut<'_, T> { #[inline] fn put_slice(&mut self, bytes: &[u8]) { self.buf_mut.put_slice(bytes); diff --git a/quic/s2n-quic-core/src/buffer/writer/storage/limit.rs b/quic/s2n-quic-core/src/buffer/writer/storage/limit.rs index e05dd61e71..1123a8188e 100644 --- a/quic/s2n-quic-core/src/buffer/writer/storage/limit.rs +++ b/quic/s2n-quic-core/src/buffer/writer/storage/limit.rs @@ -24,7 +24,7 @@ impl<'a, S: Storage + ?Sized> Limit<'a, S> { } } -impl<'a, S: Storage + ?Sized> Storage for Limit<'a, S> { +impl Storage for Limit<'_, S> { const SPECIALIZES_BYTES: bool = S::SPECIALIZES_BYTES; const SPECIALIZES_BYTES_MUT: bool = S::SPECIALIZES_BYTES_MUT; diff --git a/quic/s2n-quic-core/src/buffer/writer/storage/tracked.rs b/quic/s2n-quic-core/src/buffer/writer/storage/tracked.rs index 0b24e090c1..7020b7a072 100644 --- a/quic/s2n-quic-core/src/buffer/writer/storage/tracked.rs +++ b/quic/s2n-quic-core/src/buffer/writer/storage/tracked.rs @@ -26,7 +26,7 @@ impl<'a, S: Storage + ?Sized> Tracked<'a, S> { } } -impl<'a, S: Storage + ?Sized> Storage for Tracked<'a, S> { +impl Storage for Tracked<'_, S> { const SPECIALIZES_BYTES: bool = S::SPECIALIZES_BYTES; const SPECIALIZES_BYTES_MUT: bool = S::SPECIALIZES_BYTES_MUT; diff --git a/quic/s2n-quic-core/src/buffer/writer/storage/write_once.rs b/quic/s2n-quic-core/src/buffer/writer/storage/write_once.rs index cfd24c3771..25fe9c4f71 100644 --- a/quic/s2n-quic-core/src/buffer/writer/storage/write_once.rs +++ b/quic/s2n-quic-core/src/buffer/writer/storage/write_once.rs @@ -26,7 +26,7 @@ impl<'a, S: Storage + ?Sized> WriteOnce<'a, S> { } } -impl<'a, S: Storage + ?Sized> Storage for WriteOnce<'a, S> { +impl Storage for WriteOnce<'_, S> { const SPECIALIZES_BYTES: bool = S::SPECIALIZES_BYTES; const SPECIALIZES_BYTES_MUT: bool = S::SPECIALIZES_BYTES_MUT; diff --git a/quic/s2n-quic-core/src/connection/error.rs b/quic/s2n-quic-core/src/connection/error.rs index 40f2f18461..c2746bcb7c 100644 --- a/quic/s2n-quic-core/src/connection/error.rs +++ b/quic/s2n-quic-core/src/connection/error.rs @@ -498,7 +498,7 @@ impl From for Error { } } -impl<'a> From> for Error { +impl From> for Error { #[track_caller] fn from(error: ConnectionClose) -> Self { if let Some(frame_type) = error.frame_type { diff --git a/quic/s2n-quic-core/src/crypto/payload.rs b/quic/s2n-quic-core/src/crypto/payload.rs index a50e073477..41e4fd4e77 100644 --- a/quic/s2n-quic-core/src/crypto/payload.rs +++ b/quic/s2n-quic-core/src/crypto/payload.rs @@ -15,7 +15,7 @@ pub struct ProtectedPayload<'a> { pub(crate) buffer: DecoderBufferMut<'a>, } -impl<'a> core::fmt::Debug for ProtectedPayload<'a> { +impl core::fmt::Debug for ProtectedPayload<'_> { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> { // Since the protected payload is not very helpful for debugging purposes, // we just print the length of the protected payload as long as we are not in @@ -78,7 +78,7 @@ pub struct EncryptedPayload<'a> { pub(crate) buffer: DecoderBufferMut<'a>, } -impl<'a> core::fmt::Debug for EncryptedPayload<'a> { +impl core::fmt::Debug for EncryptedPayload<'_> { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> { // Since the protected payload is not very helpful for debugging purposes, // we just print the length of the protected payload as long as we are not in diff --git a/quic/s2n-quic-core/src/endpoint/mod.rs b/quic/s2n-quic-core/src/endpoint/mod.rs index 7e8505ff88..4b124c93ff 100644 --- a/quic/s2n-quic-core/src/endpoint/mod.rs +++ b/quic/s2n-quic-core/src/endpoint/mod.rs @@ -142,7 +142,7 @@ pub struct Wakeups<'a, E: Endpoint, C: Clock> { clock: &'a C, } -impl<'a, E: Endpoint, C: Clock> Future for Wakeups<'a, E, C> { +impl Future for Wakeups<'_, E, C> { type Output = Result; fn poll(mut self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { diff --git a/quic/s2n-quic-core/src/event/generated.rs b/quic/s2n-quic-core/src/event/generated.rs index fedfd10508..a05d4a1928 100644 --- a/quic/s2n-quic-core/src/event/generated.rs +++ b/quic/s2n-quic-core/src/event/generated.rs @@ -5,6 +5,7 @@ // This file was generated with the `s2n-quic-events` crate and any required // changes should be made there. +#![allow(clippy::needless_lifetimes)] use super::*; pub(crate) mod metrics; pub mod api { diff --git a/quic/s2n-quic-core/src/frame/ack.rs b/quic/s2n-quic-core/src/frame/ack.rs index 04ac9a501e..ec93486af7 100644 --- a/quic/s2n-quic-core/src/frame/ack.rs +++ b/quic/s2n-quic-core/src/frame/ack.rs @@ -227,14 +227,14 @@ impl<'a> AckRanges for AckRangesDecoder<'a> { } } -impl<'a> PartialEq for AckRangesDecoder<'a> { +impl PartialEq for AckRangesDecoder<'_> { #[inline] fn eq(&self, other: &Self) -> bool { self.ack_ranges().eq(other.ack_ranges()) } } -impl<'a> core::fmt::Debug for AckRangesDecoder<'a> { +impl core::fmt::Debug for AckRangesDecoder<'_> { fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result { core::fmt::Debug::fmt(&self.ack_ranges(), f) } @@ -362,7 +362,7 @@ pub struct AckRangesIter<'a> { range_buffer: DecoderBuffer<'a>, } -impl<'a> Iterator for AckRangesIter<'a> { +impl Iterator for AckRangesIter<'_> { type Item = RangeInclusive; #[inline] @@ -397,9 +397,9 @@ impl<'a> Iterator for AckRangesIter<'a> { } } -impl<'a> ExactSizeIterator for AckRangesIter<'a> {} +impl ExactSizeIterator for AckRangesIter<'_> {} -impl<'a> core::fmt::Debug for AckRangesIter<'a> { +impl core::fmt::Debug for AckRangesIter<'_> { fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result { f.debug_list().entries(*self).finish() } diff --git a/quic/s2n-quic-core/src/frame/connection_close.rs b/quic/s2n-quic-core/src/frame/connection_close.rs index 9ba8f3b68a..9aedda03ba 100644 --- a/quic/s2n-quic-core/src/frame/connection_close.rs +++ b/quic/s2n-quic-core/src/frame/connection_close.rs @@ -71,7 +71,7 @@ pub struct ConnectionClose<'a> { pub reason: Option<&'a [u8]>, } -impl<'a> ConnectionClose<'a> { +impl ConnectionClose<'_> { #[inline] pub fn tag(&self) -> u8 { if self.frame_type.is_some() { @@ -84,7 +84,7 @@ impl<'a> ConnectionClose<'a> { // If a `ConnectionClose` contains no frame type it was sent by an application and contains // an `ApplicationErrorCode`. Otherwise it is an error on the QUIC layer. -impl<'a> application::error::TryInto for ConnectionClose<'a> { +impl application::error::TryInto for ConnectionClose<'_> { #[inline] fn application_error(&self) -> Option { if self.frame_type.is_none() { @@ -129,7 +129,7 @@ decoder_parameterized_value!( } ); -impl<'a> EncoderValue for ConnectionClose<'a> { +impl EncoderValue for ConnectionClose<'_> { #[inline] fn encode(&self, buffer: &mut E) { buffer.encode(&self.tag()); diff --git a/quic/s2n-quic-core/src/frame/dc_stateless_reset_tokens.rs b/quic/s2n-quic-core/src/frame/dc_stateless_reset_tokens.rs index d86b514fde..05276840a7 100644 --- a/quic/s2n-quic-core/src/frame/dc_stateless_reset_tokens.rs +++ b/quic/s2n-quic-core/src/frame/dc_stateless_reset_tokens.rs @@ -128,7 +128,7 @@ impl<'a> ::s2n_codec::DecoderParameterizedValueMut<'a> for DcStatelessResetToken } } -impl<'a> EncoderValue for DcStatelessResetTokens<'a> { +impl EncoderValue for DcStatelessResetTokens<'_> { fn encode(&self, buffer: &mut E) { buffer.encode(&TAG); let count = diff --git a/quic/s2n-quic-core/src/frame/new_connection_id.rs b/quic/s2n-quic-core/src/frame/new_connection_id.rs index 45376c73a5..2250a302a7 100644 --- a/quic/s2n-quic-core/src/frame/new_connection_id.rs +++ b/quic/s2n-quic-core/src/frame/new_connection_id.rs @@ -66,7 +66,7 @@ pub struct NewConnectionId<'a> { pub stateless_reset_token: &'a [u8; STATELESS_RESET_TOKEN_LEN], } -impl<'a> NewConnectionId<'a> { +impl NewConnectionId<'_> { pub const fn tag(&self) -> u8 { new_connection_id_tag!() } @@ -123,7 +123,7 @@ decoder_parameterized_value!( } ); -impl<'a> EncoderValue for NewConnectionId<'a> { +impl EncoderValue for NewConnectionId<'_> { fn encode(&self, buffer: &mut E) { buffer.encode(&self.tag()); buffer.encode(&self.sequence_number); diff --git a/quic/s2n-quic-core/src/frame/new_token.rs b/quic/s2n-quic-core/src/frame/new_token.rs index 2eb078f09b..779fd4b511 100644 --- a/quic/s2n-quic-core/src/frame/new_token.rs +++ b/quic/s2n-quic-core/src/frame/new_token.rs @@ -39,7 +39,7 @@ pub struct NewToken<'a> { pub token: &'a [u8], } -impl<'a> NewToken<'a> { +impl NewToken<'_> { pub const fn tag(&self) -> u8 { new_token_tag!() } @@ -64,7 +64,7 @@ decoder_parameterized_value!( } ); -impl<'a> EncoderValue for NewToken<'a> { +impl EncoderValue for NewToken<'_> { fn encode(&self, buffer: &mut E) { buffer.encode(&self.tag()); buffer.encode_with_len_prefix::(&self.token); diff --git a/quic/s2n-quic-core/src/frame/path_challenge.rs b/quic/s2n-quic-core/src/frame/path_challenge.rs index f3c174255f..92943248bb 100644 --- a/quic/s2n-quic-core/src/frame/path_challenge.rs +++ b/quic/s2n-quic-core/src/frame/path_challenge.rs @@ -35,7 +35,7 @@ pub struct PathChallenge<'a> { pub data: &'a [u8; DATA_LEN], } -impl<'a> PathChallenge<'a> { +impl PathChallenge<'_> { pub const fn tag(&self) -> u8 { path_challenge_tag!() } @@ -56,7 +56,7 @@ decoder_parameterized_value!( } ); -impl<'a> EncoderValue for PathChallenge<'a> { +impl EncoderValue for PathChallenge<'_> { fn encode(&self, buffer: &mut E) { buffer.encode(&self.tag()); buffer.encode(&self.data.as_ref()); diff --git a/quic/s2n-quic-core/src/frame/path_response.rs b/quic/s2n-quic-core/src/frame/path_response.rs index c3e04f6d77..02ed3dcfa5 100644 --- a/quic/s2n-quic-core/src/frame/path_response.rs +++ b/quic/s2n-quic-core/src/frame/path_response.rs @@ -27,7 +27,7 @@ pub struct PathResponse<'a> { pub data: &'a [u8; DATA_LEN], } -impl<'a> PathResponse<'a> { +impl PathResponse<'_> { pub const fn tag(&self) -> u8 { path_response_tag!() } @@ -51,7 +51,7 @@ decoder_parameterized_value!( } ); -impl<'a> EncoderValue for PathResponse<'a> { +impl EncoderValue for PathResponse<'_> { fn encode(&self, buffer: &mut E) { buffer.encode(&self.tag()); buffer.encode(&self.data.as_ref()); diff --git a/quic/s2n-quic-core/src/havoc.rs b/quic/s2n-quic-core/src/havoc.rs index e6335fa2d8..59a05cc765 100644 --- a/quic/s2n-quic-core/src/havoc.rs +++ b/quic/s2n-quic-core/src/havoc.rs @@ -680,7 +680,7 @@ pub mod testing { } } - impl<'a> Random for RandomSlice<'a> { + impl Random for RandomSlice<'_> { #[inline] fn fill(&mut self, bytes: &mut [u8]) { for byte in bytes.iter_mut() { diff --git a/quic/s2n-quic-core/src/inet/ip.rs b/quic/s2n-quic-core/src/inet/ip.rs index dd91dab751..2be84c7f03 100644 --- a/quic/s2n-quic-core/src/inet/ip.rs +++ b/quic/s2n-quic-core/src/inet/ip.rs @@ -82,7 +82,7 @@ pub enum IpAddressRef<'a> { IPv6(&'a IpV6Address), } -impl<'a> IpAddressRef<'a> { +impl IpAddressRef<'_> { pub fn to_owned(self) -> IpAddress { match self { Self::IPv4(addr) => IpAddress::Ipv4(*addr), @@ -215,7 +215,7 @@ pub enum SocketAddressRef<'a> { IpV6(&'a SocketAddressV6), } -impl<'a> SocketAddressRef<'a> { +impl SocketAddressRef<'_> { pub fn to_owned(self) -> SocketAddress { match self { Self::IpV4(addr) => SocketAddress::IpV4(*addr), @@ -253,7 +253,7 @@ mod std_conversion { } } - impl<'a> net::ToSocketAddrs for SocketAddressRef<'a> { + impl net::ToSocketAddrs for SocketAddressRef<'_> { type Iter = std::iter::Once; fn to_socket_addrs(&self) -> std::io::Result { diff --git a/quic/s2n-quic-core/src/interval_set/mod.rs b/quic/s2n-quic-core/src/interval_set/mod.rs index 158f432e07..d071c7ba90 100644 --- a/quic/s2n-quic-core/src/interval_set/mod.rs +++ b/quic/s2n-quic-core/src/interval_set/mod.rs @@ -758,7 +758,7 @@ pub struct Iter<'a, T> { tail: Option>, } -impl<'a, T: IntervalBound> Iterator for Iter<'a, T> { +impl Iterator for Iter<'_, T> { type Item = T; #[inline] @@ -782,7 +782,7 @@ impl<'a, T: IntervalBound> Iterator for Iter<'a, T> { } } -impl<'a, T: IntervalBound> DoubleEndedIterator for Iter<'a, T> { +impl DoubleEndedIterator for Iter<'_, T> { #[inline] fn next_back(&mut self) -> Option { loop { diff --git a/quic/s2n-quic-core/src/io/rx/pair.rs b/quic/s2n-quic-core/src/io/rx/pair.rs index 694cc5ab94..c13f8f5e19 100644 --- a/quic/s2n-quic-core/src/io/rx/pair.rs +++ b/quic/s2n-quic-core/src/io/rx/pair.rs @@ -111,7 +111,7 @@ where b: &'a mut B, } -impl<'a, A, B> super::Queue for Queue<'a, A, B> +impl super::Queue for Queue<'_, A, B> where A: super::Queue, B: super::Queue, diff --git a/quic/s2n-quic-core/src/io/testing.rs b/quic/s2n-quic-core/src/io/testing.rs index 0fcf47bba3..baa55fef38 100644 --- a/quic/s2n-quic-core/src/io/testing.rs +++ b/quic/s2n-quic-core/src/io/testing.rs @@ -126,7 +126,7 @@ pub struct Queue<'a> { messages: &'a mut Vec, } -impl<'a> tx::Queue for Queue<'a> { +impl tx::Queue for Queue<'_> { type Handle = Tuple; #[inline] @@ -155,7 +155,7 @@ impl<'a> tx::Queue for Queue<'a> { } } -impl<'a> rx::Queue for Queue<'a> { +impl rx::Queue for Queue<'_> { type Handle = Tuple; #[inline] diff --git a/quic/s2n-quic-core/src/io/tx/handle_map.rs b/quic/s2n-quic-core/src/io/tx/handle_map.rs index 7c19612e59..ecc553d92f 100644 --- a/quic/s2n-quic-core/src/io/tx/handle_map.rs +++ b/quic/s2n-quic-core/src/io/tx/handle_map.rs @@ -82,7 +82,7 @@ where handle: PhantomData, } -impl<'a, Map, Tx, U> tx::Queue for Queue<'a, Map, Tx, U> +impl tx::Queue for Queue<'_, Map, Tx, U> where Map: Fn(&U) -> Tx::Handle, Tx: tx::Queue, diff --git a/quic/s2n-quic-core/src/io/tx/router.rs b/quic/s2n-quic-core/src/io/tx/router.rs index b481b590db..0fbe941ee3 100644 --- a/quic/s2n-quic-core/src/io/tx/router.rs +++ b/quic/s2n-quic-core/src/io/tx/router.rs @@ -133,7 +133,7 @@ where b: &'a mut B, } -impl<'a, R, A, B> super::Queue for Queue<'a, R, A, B> +impl super::Queue for Queue<'_, R, A, B> where R: Router, A: super::Queue, diff --git a/quic/s2n-quic-core/src/packet/handshake.rs b/quic/s2n-quic-core/src/packet/handshake.rs index 4e78160382..d2f849a5e2 100644 --- a/quic/s2n-quic-core/src/packet/handshake.rs +++ b/quic/s2n-quic-core/src/packet/handshake.rs @@ -197,7 +197,7 @@ impl<'a> EncryptedHandshake<'a> { } } -impl<'a> CleartextHandshake<'a> { +impl CleartextHandshake<'_> { #[inline] pub fn destination_connection_id(&self) -> &[u8] { self.destination_connection_id diff --git a/quic/s2n-quic-core/src/packet/initial.rs b/quic/s2n-quic-core/src/packet/initial.rs index 38ffc644b3..baa0d9ed51 100644 --- a/quic/s2n-quic-core/src/packet/initial.rs +++ b/quic/s2n-quic-core/src/packet/initial.rs @@ -219,7 +219,7 @@ impl<'a> EncryptedInitial<'a> { } } -impl<'a> CleartextInitial<'a> { +impl CleartextInitial<'_> { #[inline] pub fn destination_connection_id(&self) -> &[u8] { self.destination_connection_id diff --git a/quic/s2n-quic-core/src/packet/long.rs b/quic/s2n-quic-core/src/packet/long.rs index 57ce2c2a14..514639bf56 100644 --- a/quic/s2n-quic-core/src/packet/long.rs +++ b/quic/s2n-quic-core/src/packet/long.rs @@ -198,14 +198,14 @@ pub(crate) struct LongPayloadEncoder { pub payload: Payload, } -impl<'a, Payload: EncoderValue> EncoderValue for LongPayloadEncoder<&'a Payload> { +impl EncoderValue for LongPayloadEncoder<&Payload> { fn encode(&self, encoder: &mut E) { self.packet_number.encode(encoder); self.payload.encode(encoder); } } -impl<'a, Payload: EncoderValue> EncoderValue for LongPayloadEncoder<&'a mut Payload> { +impl EncoderValue for LongPayloadEncoder<&mut Payload> { fn encode(&self, encoder: &mut E) { self.packet_number.encode(encoder); self.payload.encode(encoder); diff --git a/quic/s2n-quic-core/src/packet/number/map.rs b/quic/s2n-quic-core/src/packet/number/map.rs index a06e4f7112..dc8d69e062 100644 --- a/quic/s2n-quic-core/src/packet/number/map.rs +++ b/quic/s2n-quic-core/src/packet/number/map.rs @@ -495,7 +495,7 @@ impl<'a, V> RemoveIter<'a, V> { } } -impl<'a, V> Iterator for RemoveIter<'a, V> { +impl Iterator for RemoveIter<'_, V> { type Item = (PacketNumber, V); #[inline] @@ -518,7 +518,7 @@ impl<'a, V> Iterator for RemoveIter<'a, V> { } } -impl<'a, V> Drop for RemoveIter<'a, V> { +impl Drop for RemoveIter<'_, V> { fn drop(&mut self) { // make sure the iterator is drained, otherwise the entries might dangle while self.next().is_some() {} diff --git a/quic/s2n-quic-core/src/packet/retry.rs b/quic/s2n-quic-core/src/packet/retry.rs index f6e2efb4e4..f891205182 100644 --- a/quic/s2n-quic-core/src/packet/retry.rs +++ b/quic/s2n-quic-core/src/packet/retry.rs @@ -299,7 +299,7 @@ impl<'a> Retry<'a> { } } -impl<'a> EncoderValue for Retry<'a> { +impl EncoderValue for Retry<'_> { fn encode(&self, encoder: &mut E) { let tag: u8 = self.tag; tag.encode(encoder); @@ -315,7 +315,7 @@ impl<'a> EncoderValue for Retry<'a> { } } -impl<'a> EncoderValue for PseudoRetry<'a> { +impl EncoderValue for PseudoRetry<'_> { fn encode(&self, encoder: &mut E) { self.original_destination_connection_id .encode_with_len_prefix::(encoder); diff --git a/quic/s2n-quic-core/src/packet/short.rs b/quic/s2n-quic-core/src/packet/short.rs index 8b2e52582f..3f734de39b 100644 --- a/quic/s2n-quic-core/src/packet/short.rs +++ b/quic/s2n-quic-core/src/packet/short.rs @@ -245,7 +245,7 @@ impl<'a> EncryptedShort<'a> { } } -impl<'a> CleartextShort<'a> { +impl CleartextShort<'_> { #[inline] pub fn destination_connection_id(&self) -> &[u8] { self.destination_connection_id diff --git a/quic/s2n-quic-core/src/packet/version_negotiation.rs b/quic/s2n-quic-core/src/packet/version_negotiation.rs index 7018f38e5f..77870f40d5 100644 --- a/quic/s2n-quic-core/src/packet/version_negotiation.rs +++ b/quic/s2n-quic-core/src/packet/version_negotiation.rs @@ -157,7 +157,7 @@ impl<'a> IntoIterator for ProtectedVersionNegotiation<'a> { #[derive(Clone, Copy, Debug)] pub struct VersionNegotiationIterator<'a>(DecoderBuffer<'a>); -impl<'a> Iterator for VersionNegotiationIterator<'a> { +impl Iterator for VersionNegotiationIterator<'_> { type Item = u32; fn next(&mut self) -> Option { @@ -170,9 +170,7 @@ impl<'a> Iterator for VersionNegotiationIterator<'a> { } } -impl<'a, SupportedVersions: EncoderValue> EncoderValue - for VersionNegotiation<'a, SupportedVersions> -{ +impl EncoderValue for VersionNegotiation<'_, SupportedVersions> { fn encode(&self, encoder: &mut E) { (self.tag | ENCODING_TAG).encode(encoder); VERSION.encode(encoder); diff --git a/quic/s2n-quic-core/src/packet/zero_rtt.rs b/quic/s2n-quic-core/src/packet/zero_rtt.rs index a9c97e1e74..5b9fff4ca3 100644 --- a/quic/s2n-quic-core/src/packet/zero_rtt.rs +++ b/quic/s2n-quic-core/src/packet/zero_rtt.rs @@ -175,7 +175,7 @@ impl<'a> EncryptedZeroRtt<'a> { } } -impl<'a> CleartextZeroRtt<'a> { +impl CleartextZeroRtt<'_> { #[inline] pub fn destination_connection_id(&self) -> &[u8] { self.destination_connection_id diff --git a/quic/s2n-quic-core/src/path/mod.rs b/quic/s2n-quic-core/src/path/mod.rs index af6d4386ff..871a4a0d4f 100644 --- a/quic/s2n-quic-core/src/path/mod.rs +++ b/quic/s2n-quic-core/src/path/mod.rs @@ -409,7 +409,7 @@ pub mod testing { event::{builder::SocketAddress, IntoEvent}, }; - impl<'a> event::builder::Path<'a> { + impl event::builder::Path<'_> { pub fn test() -> Self { Self { local_addr: SocketAddress::IpV4 { diff --git a/quic/s2n-quic-core/src/recovery/congestion_controller.rs b/quic/s2n-quic-core/src/recovery/congestion_controller.rs index de7f431b0c..ac2a72bdf8 100644 --- a/quic/s2n-quic-core/src/recovery/congestion_controller.rs +++ b/quic/s2n-quic-core/src/recovery/congestion_controller.rs @@ -76,7 +76,7 @@ impl<'a, Pub: event::ConnectionPublisher> PathPublisher<'a, Pub> { } } -impl<'a, Pub: event::ConnectionPublisher> Publisher for PathPublisher<'a, Pub> { +impl Publisher for PathPublisher<'_, Pub> { #[inline] fn on_slow_start_exited(&mut self, cause: SlowStartExitCause, congestion_window: u32) { self.publisher diff --git a/quic/s2n-quic-core/src/stream/error.rs b/quic/s2n-quic-core/src/stream/error.rs index 32eb7bef5e..36fb4a9c09 100644 --- a/quic/s2n-quic-core/src/stream/error.rs +++ b/quic/s2n-quic-core/src/stream/error.rs @@ -207,7 +207,7 @@ impl From for StreamError { } } -impl<'a> From> for StreamError { +impl From> for StreamError { #[track_caller] fn from(error: ConnectionClose) -> Self { let error: connection::Error = error.into(); diff --git a/quic/s2n-quic-core/src/stream/ops.rs b/quic/s2n-quic-core/src/stream/ops.rs index fe83ed1549..a3c50869f5 100644 --- a/quic/s2n-quic-core/src/stream/ops.rs +++ b/quic/s2n-quic-core/src/stream/ops.rs @@ -276,7 +276,7 @@ pub mod rx { pub detached: bool, } - impl<'a> Default for Request<'a> { + impl Default for Request<'_> { fn default() -> Self { Self { chunks: None, diff --git a/quic/s2n-quic-core/src/sync/spsc/recv.rs b/quic/s2n-quic-core/src/sync/spsc/recv.rs index 207a89f67f..9764af4d05 100644 --- a/quic/s2n-quic-core/src/sync/spsc/recv.rs +++ b/quic/s2n-quic-core/src/sync/spsc/recv.rs @@ -98,7 +98,7 @@ impl Drop for Receiver { pub struct RecvSlice<'a, T>(&'a mut State, Cursor); -impl<'a, T> RecvSlice<'a, T> { +impl RecvSlice<'_, T> { #[inline] pub fn peek(&mut self) -> (&mut [T], &mut [T]) { let _ = self.0.acquire_filled(); @@ -180,7 +180,7 @@ impl<'a, T> RecvSlice<'a, T> { } } -impl<'a, T> Drop for RecvSlice<'a, T> { +impl Drop for RecvSlice<'_, T> { #[inline] fn drop(&mut self) { self.0.persist_head(self.1); @@ -191,7 +191,7 @@ struct Acquire<'a, T> { receiver: &'a mut Receiver, } -impl<'a, T> Future for Acquire<'a, T> { +impl Future for Acquire<'_, T> { type Output = Result<()>; #[inline] diff --git a/quic/s2n-quic-core/src/sync/spsc/send.rs b/quic/s2n-quic-core/src/sync/spsc/send.rs index e7cb5e0f80..18a3843a45 100644 --- a/quic/s2n-quic-core/src/sync/spsc/send.rs +++ b/quic/s2n-quic-core/src/sync/spsc/send.rs @@ -83,7 +83,7 @@ impl Drop for Sender { pub struct SendSlice<'a, T>(&'a mut State, Cursor); -impl<'a, T> SendSlice<'a, T> { +impl SendSlice<'_, T> { #[inline] pub fn push(&mut self, value: T) -> Result<(), PushError> { if self.0.cursor.is_full() && !self.0.acquire_capacity()? { @@ -143,7 +143,7 @@ impl<'a, T> SendSlice<'a, T> { } } -impl<'a, T> Drop for SendSlice<'a, T> { +impl Drop for SendSlice<'_, T> { #[inline] fn drop(&mut self) { self.0.persist_tail(self.1); @@ -154,7 +154,7 @@ struct Acquire<'a, T> { sender: &'a mut Sender, } -impl<'a, T> Future for Acquire<'a, T> { +impl Future for Acquire<'_, T> { type Output = Result<()>; #[inline] diff --git a/quic/s2n-quic-core/src/sync/spsc/slice.rs b/quic/s2n-quic-core/src/sync/spsc/slice.rs index ca0e814247..f03684ce20 100644 --- a/quic/s2n-quic-core/src/sync/spsc/slice.rs +++ b/quic/s2n-quic-core/src/sync/spsc/slice.rs @@ -66,7 +66,7 @@ impl<'a, T> Slice<'a, UnsafeCell> { } } -impl<'a, T> Deref for Slice<'a, T> { +impl Deref for Slice<'_, T> { type Target = [T]; #[inline] @@ -75,7 +75,7 @@ impl<'a, T> Deref for Slice<'a, T> { } } -impl<'a, T: PartialEq> PartialEq<[T]> for Slice<'a, UnsafeCell> { +impl PartialEq<[T]> for Slice<'_, UnsafeCell> { #[inline] fn eq(&self, other: &[T]) -> bool { if self.len() != other.len() { diff --git a/quic/s2n-quic-core/src/sync/worker.rs b/quic/s2n-quic-core/src/sync/worker.rs index ed6ef8fce8..50f8ea0c1d 100644 --- a/quic/s2n-quic-core/src/sync/worker.rs +++ b/quic/s2n-quic-core/src/sync/worker.rs @@ -130,7 +130,7 @@ impl Default for State { struct Acquire<'a>(&'a mut Receiver); -impl<'a> Future for Acquire<'a> { +impl Future for Acquire<'_> { type Output = Option; #[inline] diff --git a/quic/s2n-quic-core/src/task/cooldown.rs b/quic/s2n-quic-core/src/task/cooldown.rs index 4ea6a1f95f..b508f13bd5 100644 --- a/quic/s2n-quic-core/src/task/cooldown.rs +++ b/quic/s2n-quic-core/src/task/cooldown.rs @@ -110,7 +110,7 @@ pin_project!( } ); -impl<'a, F> Future for Wrapped<'a, F> +impl Future for Wrapped<'_, F> where F: Future, { diff --git a/quic/s2n-quic-core/src/time/clock.rs b/quic/s2n-quic-core/src/time/clock.rs index 71f75f3703..59938cf672 100644 --- a/quic/s2n-quic-core/src/time/clock.rs +++ b/quic/s2n-quic-core/src/time/clock.rs @@ -72,7 +72,7 @@ impl<'a, C: Clock + ?Sized> Cached<'a, C> { } } -impl<'a, C: Clock + ?Sized> Clock for Cached<'a, C> { +impl Clock for Cached<'_, C> { #[inline] fn get_time(&self) -> Timestamp { if let Some(time) = self.cached_value.get() { diff --git a/quic/s2n-quic-core/src/transmission/writer/testing.rs b/quic/s2n-quic-core/src/transmission/writer/testing.rs index abb3254d8b..6a545e8013 100644 --- a/quic/s2n-quic-core/src/transmission/writer/testing.rs +++ b/quic/s2n-quic-core/src/transmission/writer/testing.rs @@ -242,7 +242,7 @@ impl<'a> Writer<'a> { } } -impl<'a> super::Writer for Writer<'a> { +impl super::Writer for Writer<'_> { fn current_time(&self) -> Timestamp { self.current_time } diff --git a/quic/s2n-quic-core/src/transport/error.rs b/quic/s2n-quic-core/src/transport/error.rs index 5b208402f6..e73f6277ab 100644 --- a/quic/s2n-quic-core/src/transport/error.rs +++ b/quic/s2n-quic-core/src/transport/error.rs @@ -87,7 +87,7 @@ impl fmt::Debug for Error { } } -impl<'a> From for ConnectionClose<'a> { +impl From for ConnectionClose<'_> { fn from(error: Error) -> Self { ConnectionClose { error_code: error.code.0, diff --git a/quic/s2n-quic-core/src/xdp/encoder.rs b/quic/s2n-quic-core/src/xdp/encoder.rs index 508dd6af19..86cfe9fd71 100644 --- a/quic/s2n-quic-core/src/xdp/encoder.rs +++ b/quic/s2n-quic-core/src/xdp/encoder.rs @@ -354,7 +354,7 @@ mod tests { payload: Vec, } - impl<'a> tx::Message for &'a Message { + impl tx::Message for &Message { type Handle = path::Tuple; fn path_handle(&self) -> &Self::Handle { diff --git a/quic/s2n-quic-events/src/output.rs b/quic/s2n-quic-events/src/output.rs index c792af3685..1438717ee6 100644 --- a/quic/s2n-quic-events/src/output.rs +++ b/quic/s2n-quic-events/src/output.rs @@ -160,6 +160,8 @@ impl ToTokens for Output { )); tokens.extend(quote!( + #![allow(clippy::needless_lifetimes)] + use super::*; #top_level diff --git a/quic/s2n-quic-platform/src/bpf/program.rs b/quic/s2n-quic-platform/src/bpf/program.rs index 4bac14f62e..e5f7a71a81 100644 --- a/quic/s2n-quic-platform/src/bpf/program.rs +++ b/quic/s2n-quic-platform/src/bpf/program.rs @@ -44,7 +44,7 @@ impl<'a, D: Dialect> Program<'a, D> { } } -impl<'a, D: Dialect> fmt::Debug for Program<'a, D> { +impl fmt::Debug for Program<'_, D> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.debug_struct("Program") .field("instructions", &self.instructions) @@ -52,7 +52,7 @@ impl<'a, D: Dialect> fmt::Debug for Program<'a, D> { } } -impl<'a, D: Dialect> fmt::Display for Program<'a, D> { +impl fmt::Display for Program<'_, D> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { for inst in self.instructions { writeln!(f, "{inst}")?; diff --git a/quic/s2n-quic-platform/src/message.rs b/quic/s2n-quic-platform/src/message.rs index 1e7e58ad53..54274dc257 100644 --- a/quic/s2n-quic-platform/src/message.rs +++ b/quic/s2n-quic-platform/src/message.rs @@ -140,7 +140,7 @@ pub struct RxMessage<'a, Handle: Copy> { pub payload: &'a mut [u8], } -impl<'a, Handle: Copy> RxMessage<'a, Handle> { +impl RxMessage<'_, Handle> { #[inline] pub fn for_each, &mut [u8])>(self, mut on_packet: F) { // `chunks_mut` doesn't know what to do with zero-sized segments so return early diff --git a/quic/s2n-quic-platform/src/message/cmsg/storage.rs b/quic/s2n-quic-platform/src/message/cmsg/storage.rs index 1ebda4995d..7bbc420d16 100644 --- a/quic/s2n-quic-platform/src/message/cmsg/storage.rs +++ b/quic/s2n-quic-platform/src/message/cmsg/storage.rs @@ -86,7 +86,7 @@ impl<'a, const L: usize> Encoder<'a, L> { } } -impl<'a, const L: usize> Deref for Encoder<'a, L> { +impl Deref for Encoder<'_, L> { type Target = [u8]; #[inline] @@ -95,14 +95,14 @@ impl<'a, const L: usize> Deref for Encoder<'a, L> { } } -impl<'a, const L: usize> DerefMut for Encoder<'a, L> { +impl DerefMut for Encoder<'_, L> { #[inline] fn deref_mut(&mut self) -> &mut [u8] { &mut self.storage[..self.cursor] } } -impl<'a, const L: usize> super::Encoder for Encoder<'a, L> { +impl super::Encoder for Encoder<'_, L> { #[inline] fn encode_cmsg( &mut self, diff --git a/quic/s2n-quic-platform/src/message/msg/ext.rs b/quic/s2n-quic-platform/src/message/msg/ext.rs index fff3275400..7dc1ff99e2 100644 --- a/quic/s2n-quic-platform/src/message/msg/ext.rs +++ b/quic/s2n-quic-platform/src/message/msg/ext.rs @@ -84,7 +84,7 @@ pub struct MsghdrEncoder<'a> { msghdr: &'a mut msghdr, } -impl<'a> Encoder for MsghdrEncoder<'a> { +impl Encoder for MsghdrEncoder<'_> { #[inline] fn encode_cmsg( &mut self, diff --git a/quic/s2n-quic-platform/src/socket/io/rx.rs b/quic/s2n-quic-platform/src/socket/io/rx.rs index 68c25efedc..db7ae451cf 100644 --- a/quic/s2n-quic-platform/src/socket/io/rx.rs +++ b/quic/s2n-quic-platform/src/socket/io/rx.rs @@ -109,7 +109,7 @@ pub struct RxQueue<'a, T: Message> { local_address: &'a LocalAddress, } -impl<'a, T: Message> rx::Queue for RxQueue<'a, T> { +impl rx::Queue for RxQueue<'_, T> { type Handle = T::Handle; #[inline] diff --git a/quic/s2n-quic-platform/src/socket/io/tx.rs b/quic/s2n-quic-platform/src/socket/io/tx.rs index 5ea6be7ec9..147e709910 100644 --- a/quic/s2n-quic-platform/src/socket/io/tx.rs +++ b/quic/s2n-quic-platform/src/socket/io/tx.rs @@ -196,7 +196,7 @@ pub struct TxQueue<'a, T: Message> { is_full: &'a mut bool, } -impl<'a, T: Message> TxQueue<'a, T> { +impl TxQueue<'_, T> { /// Tries to send a message as a GSO segment /// /// Returns the Err(Message) if it was not able to. Otherwise, the index of the GSO'd message is returned. @@ -382,7 +382,7 @@ impl<'a, T: Message> TxQueue<'a, T> { } } -impl<'a, T: Message> tx::Queue for TxQueue<'a, T> { +impl tx::Queue for TxQueue<'_, T> { type Handle = T::Handle; const SUPPORTS_ECN: bool = T::SUPPORTS_ECN; @@ -464,7 +464,7 @@ impl<'a, T: Message> tx::Queue for TxQueue<'a, T> { } } -impl<'a, T: Message> Drop for TxQueue<'a, T> { +impl Drop for TxQueue<'_, T> { #[inline] fn drop(&mut self) { // flush the current GSO message, if possible diff --git a/quic/s2n-quic-sim/src/run/range.rs b/quic/s2n-quic-sim/src/run/range.rs index 2de484f9ca..55b6db56a0 100644 --- a/quic/s2n-quic-sim/src/run/range.rs +++ b/quic/s2n-quic-sim/src/run/range.rs @@ -103,7 +103,7 @@ where struct Visitor(PhantomData); -impl<'de, T> serde::de::Visitor<'de> for Visitor +impl serde::de::Visitor<'_> for Visitor where T: Copy + FromStr, ::Err: core::fmt::Display, diff --git a/quic/s2n-quic-sim/src/stats.rs b/quic/s2n-quic-sim/src/stats.rs index 6bfb176059..8573cacd29 100644 --- a/quic/s2n-quic-sim/src/stats.rs +++ b/quic/s2n-quic-sim/src/stats.rs @@ -687,7 +687,7 @@ impl FromStr for Query { struct StrVisitor(core::marker::PhantomData); -impl<'de, T> serde::de::Visitor<'de> for StrVisitor +impl serde::de::Visitor<'_> for StrVisitor where T: FromStr, ::Err: core::fmt::Display, diff --git a/quic/s2n-quic-transport/src/connection/close_sender.rs b/quic/s2n-quic-transport/src/connection/close_sender.rs index c3b72c3536..13297c67ac 100644 --- a/quic/s2n-quic-transport/src/connection/close_sender.rs +++ b/quic/s2n-quic-transport/src/connection/close_sender.rs @@ -129,8 +129,8 @@ pub struct Transmission<'a, Config: endpoint::Config, Pub: event::ConnectionPubl publisher: &'a mut Pub, } -impl<'a, Config: endpoint::Config, Pub: event::ConnectionPublisher> tx::Message - for Transmission<'a, Config, Pub> +impl tx::Message + for Transmission<'_, Config, Pub> { type Handle = Config::PathHandle; diff --git a/quic/s2n-quic-transport/src/connection/transmission.rs b/quic/s2n-quic-transport/src/connection/transmission.rs index 86a767fc93..d91b4e80a3 100644 --- a/quic/s2n-quic-transport/src/connection/transmission.rs +++ b/quic/s2n-quic-transport/src/connection/transmission.rs @@ -32,7 +32,7 @@ pub struct ConnectionTransmissionContext<'a, 'sub, Config: endpoint::Config> { pub packet_interceptor: &'a mut Config::PacketInterceptor, } -impl<'a, 'sub, Config: endpoint::Config> ConnectionTransmissionContext<'a, 'sub, Config> { +impl ConnectionTransmissionContext<'_, '_, Config> { pub fn path(&self) -> &Path { &self.path_manager[self.path_id] } @@ -47,7 +47,7 @@ pub struct ConnectionTransmission<'a, 'sub, Config: endpoint::Config> { pub space_manager: &'a mut PacketSpaceManager, } -impl<'a, 'sub, Config: endpoint::Config> tx::Message for ConnectionTransmission<'a, 'sub, Config> { +impl tx::Message for ConnectionTransmission<'_, '_, Config> { type Handle = Config::PathHandle; #[inline] diff --git a/quic/s2n-quic-transport/src/recovery/manager/tests.rs b/quic/s2n-quic-transport/src/recovery/manager/tests.rs index adddbb33c8..1f3a66ffc2 100644 --- a/quic/s2n-quic-transport/src/recovery/manager/tests.rs +++ b/quic/s2n-quic-transport/src/recovery/manager/tests.rs @@ -3642,7 +3642,7 @@ impl<'a, Config: endpoint::Config> MockContext<'a, Config> { } } -impl<'a, Config: endpoint::Config> recovery::Context for MockContext<'a, Config> { +impl recovery::Context for MockContext<'_, Config> { const ENDPOINT_TYPE: endpoint::Type = Config::ENDPOINT_TYPE; fn is_handshake_confirmed(&self) -> bool { diff --git a/quic/s2n-quic-transport/src/space/application.rs b/quic/s2n-quic-transport/src/space/application.rs index 4fbe3fbb54..e22bb450a8 100644 --- a/quic/s2n-quic-transport/src/space/application.rs +++ b/quic/s2n-quic-transport/src/space/application.rs @@ -57,8 +57,6 @@ pub struct ApplicationSpace { /// TODO: Spin me pub spin_bit: SpinBit, pub crypto_stream: CryptoStream, - /// The crypto suite for application data - /// TODO: What about ZeroRtt? //= https://www.rfc-editor.org/rfc/rfc9001#section-6.3 //# For this reason, endpoints MUST be able to retain two sets of packet //# protection keys for receiving packets: the current and the next. @@ -66,6 +64,8 @@ pub struct ApplicationSpace { //= https://www.rfc-editor.org/rfc/rfc9001#section-6.1 //# An endpoint MUST NOT initiate a key update prior to having confirmed //# the handshake (Section 4.1.2). + /// The crypto suite for application data + /// TODO: What about ZeroRtt? key_set: KeySet<<::Session as CryptoSuite>::OneRttKey>, header_key: <::Session as CryptoSuite>::OneRttHeaderKey, @@ -719,7 +719,7 @@ struct RecoveryContext<'a, Config: endpoint::Config> { dc_manager: &'a mut dc::Manager, } -impl<'a, Config: endpoint::Config> recovery::Context for RecoveryContext<'a, Config> { +impl recovery::Context for RecoveryContext<'_, Config> { const ENDPOINT_TYPE: endpoint::Type = Config::ENDPOINT_TYPE; fn is_handshake_confirmed(&self) -> bool { diff --git a/quic/s2n-quic-transport/src/space/datagram.rs b/quic/s2n-quic-transport/src/space/datagram.rs index 1600e51517..fa1cef1371 100644 --- a/quic/s2n-quic-transport/src/space/datagram.rs +++ b/quic/s2n-quic-transport/src/space/datagram.rs @@ -102,7 +102,7 @@ struct Packet<'a, C: WriteContext> { max_datagram_payload: u64, } -impl<'a, C: WriteContext> s2n_quic_core::datagram::Packet for Packet<'a, C> { +impl s2n_quic_core::datagram::Packet for Packet<'_, C> { /// Returns the remaining space in the packet fn remaining_capacity(&self) -> usize { let space = self.context.remaining_capacity(); diff --git a/quic/s2n-quic-transport/src/space/handshake.rs b/quic/s2n-quic-transport/src/space/handshake.rs index 1a2772bc95..3abd5f0f6d 100644 --- a/quic/s2n-quic-transport/src/space/handshake.rs +++ b/quic/s2n-quic-transport/src/space/handshake.rs @@ -429,7 +429,7 @@ struct RecoveryContext<'a, Config: endpoint::Config> { path_manager: &'a mut path::Manager, } -impl<'a, Config: endpoint::Config> recovery::Context for RecoveryContext<'a, Config> { +impl recovery::Context for RecoveryContext<'_, Config> { const ENDPOINT_TYPE: endpoint::Type = Config::ENDPOINT_TYPE; fn is_handshake_confirmed(&self) -> bool { diff --git a/quic/s2n-quic-transport/src/space/initial.rs b/quic/s2n-quic-transport/src/space/initial.rs index 67b5649e2a..30017ad1fd 100644 --- a/quic/s2n-quic-transport/src/space/initial.rs +++ b/quic/s2n-quic-transport/src/space/initial.rs @@ -553,7 +553,7 @@ struct RecoveryContext<'a, Config: endpoint::Config> { path_manager: &'a mut path::Manager, } -impl<'a, Config: endpoint::Config> recovery::Context for RecoveryContext<'a, Config> { +impl recovery::Context for RecoveryContext<'_, Config> { const ENDPOINT_TYPE: endpoint::Type = Config::ENDPOINT_TYPE; fn is_handshake_confirmed(&self) -> bool { diff --git a/quic/s2n-quic-transport/src/space/mod.rs b/quic/s2n-quic-transport/src/space/mod.rs index d103d2ed16..0be931f0e9 100644 --- a/quic/s2n-quic-transport/src/space/mod.rs +++ b/quic/s2n-quic-transport/src/space/mod.rs @@ -1128,13 +1128,12 @@ struct AckInterceptContext< } impl< - 'a, Config: endpoint::Config, Pub: event::ConnectionPublisher, Space: PacketSpace, OnProcessedFrame: FnMut(&Ack<&ack::Ranges>), > s2n_quic_core::packet::interceptor::Ack - for AckInterceptContext<'a, Config, Pub, Space, OnProcessedFrame> + for AckInterceptContext<'_, Config, Pub, Space, OnProcessedFrame> { fn space(&self) -> PacketNumberSpace { self.packet_number.space() diff --git a/quic/s2n-quic-transport/src/space/session_context.rs b/quic/s2n-quic-transport/src/space/session_context.rs index 4573196a4d..374a4555da 100644 --- a/quic/s2n-quic-transport/src/space/session_context.rs +++ b/quic/s2n-quic-transport/src/space/session_context.rs @@ -64,9 +64,7 @@ pub struct SessionContext<'a, Config: endpoint::Config, Pub: event::ConnectionPu pub dc: &'a mut Config::DcEndpoint, } -impl<'a, Config: endpoint::Config, Pub: event::ConnectionPublisher> - SessionContext<'a, Config, Pub> -{ +impl SessionContext<'_, Config, Pub> { // This is called by the client fn on_server_params( &mut self, @@ -322,9 +320,9 @@ impl<'a, Config: endpoint::Config, Pub: event::ConnectionPublisher> } } -impl<'a, Config: endpoint::Config, Pub: event::ConnectionPublisher> +impl tls::Context<::Session> - for SessionContext<'a, Config, Pub> + for SessionContext<'_, Config, Pub> { fn on_handshake_keys( &mut self, diff --git a/quic/s2n-quic-transport/src/stream/api.rs b/quic/s2n-quic-transport/src/stream/api.rs index eac98e13a9..e9061b536f 100644 --- a/quic/s2n-quic-transport/src/stream/api.rs +++ b/quic/s2n-quic-transport/src/stream/api.rs @@ -522,7 +522,7 @@ pub struct Request<'state, 'chunks> { request: ops::Request<'chunks>, } -impl<'state, 'chunks> Request<'state, 'chunks> { +impl<'chunks> Request<'_, 'chunks> { tx_request_apis!(); rx_request_apis!(); @@ -566,7 +566,7 @@ impl<'state, 'chunks> Request<'state, 'chunks> { } } -impl<'state, 'chunks> Future for Request<'state, 'chunks> { +impl Future for Request<'_, '_> { type Output = Result; fn poll( @@ -582,7 +582,7 @@ pub struct TxRequest<'state, 'chunks> { request: ops::Request<'chunks>, } -impl<'state, 'chunks> TxRequest<'state, 'chunks> { +impl<'chunks> TxRequest<'_, 'chunks> { tx_request_apis!(); pub fn poll(&mut self, context: Option<&Context>) -> Result { @@ -607,7 +607,7 @@ impl<'state, 'chunks> TxRequest<'state, 'chunks> { } } -impl<'state, 'chunks> Future for TxRequest<'state, 'chunks> { +impl Future for TxRequest<'_, '_> { type Output = Result; fn poll( @@ -623,7 +623,7 @@ pub struct RxRequest<'state, 'chunks> { request: ops::Request<'chunks>, } -impl<'state, 'chunks> RxRequest<'state, 'chunks> { +impl<'chunks> RxRequest<'_, 'chunks> { rx_request_apis!(); pub fn poll(&mut self, context: Option<&Context>) -> Result { @@ -648,7 +648,7 @@ impl<'state, 'chunks> RxRequest<'state, 'chunks> { } } -impl<'state, 'chunks> Future for RxRequest<'state, 'chunks> { +impl Future for RxRequest<'_, '_> { type Output = Result; fn poll( diff --git a/quic/s2n-quic-transport/src/stream/stream_interests.rs b/quic/s2n-quic-transport/src/stream/stream_interests.rs index 7c67a515b5..4c2e3b7958 100644 --- a/quic/s2n-quic-transport/src/stream/stream_interests.rs +++ b/quic/s2n-quic-transport/src/stream/stream_interests.rs @@ -43,7 +43,7 @@ impl StreamInterests { pub struct TransmissionInterest<'a>(&'a mut Interest); -impl<'a> Query for TransmissionInterest<'a> { +impl Query for TransmissionInterest<'_> { fn on_interest(&mut self, interest: Interest) -> Result { debug_assert_ne!( interest, diff --git a/quic/s2n-quic-transport/src/sync/data_sender/buffer.rs b/quic/s2n-quic-transport/src/sync/data_sender/buffer.rs index 9bc9e3b774..21a9522198 100644 --- a/quic/s2n-quic-transport/src/sync/data_sender/buffer.rs +++ b/quic/s2n-quic-transport/src/sync/data_sender/buffer.rs @@ -361,7 +361,7 @@ impl<'a> Slice<'a> for Bytes { } } -impl<'a> EncoderValue for &mut View<'a> { +impl EncoderValue for &mut View<'_> { #[inline] fn encode(&self, encoder: &mut E) { // Specialize on writing byte chunks directly instead of copying the slices diff --git a/quic/s2n-quic-transport/src/sync/data_sender/transmissions.rs b/quic/s2n-quic-transport/src/sync/data_sender/transmissions.rs index 57d77ea2d8..c0ca59fe2b 100644 --- a/quic/s2n-quic-transport/src/sync/data_sender/transmissions.rs +++ b/quic/s2n-quic-transport/src/sync/data_sender/transmissions.rs @@ -325,7 +325,7 @@ struct SetRemoveIter<'a> { transmissions: &'a mut TransmissionSlab, } -impl<'a> Iterator for SetRemoveIter<'a> { +impl Iterator for SetRemoveIter<'_> { type Item = Interval; #[inline] diff --git a/quic/s2n-quic-transport/src/transmission/application.rs b/quic/s2n-quic-transport/src/transmission/application.rs index ee86011a54..abdf358336 100644 --- a/quic/s2n-quic-transport/src/transmission/application.rs +++ b/quic/s2n-quic-transport/src/transmission/application.rs @@ -71,7 +71,7 @@ impl<'a, Config: endpoint::Config> Payload<'a, Config> { } } -impl<'a, Config: endpoint::Config> super::Payload for Payload<'a, Config> { +impl super::Payload for Payload<'_, Config> { fn size_hint(&self, range: RangeInclusive) -> usize { // We need at least 1 byte to write a HANDSHAKE_DONE or PING frame (*range.start()).max(1) @@ -86,7 +86,7 @@ impl<'a, Config: endpoint::Config> super::Payload for Payload<'a, Config> { } } -impl<'a, Config: endpoint::Config> transmission::interest::Provider for Payload<'a, Config> { +impl transmission::interest::Provider for Payload<'_, Config> { fn transmission_interest( &self, query: &mut Q, @@ -113,7 +113,7 @@ pub struct Normal<'a, Config: endpoint::Config> { prioritize_datagrams: bool, } -impl<'a, Config: endpoint::Config> Normal<'a, Config> { +impl Normal<'_, Config> { fn on_transmit(&mut self, context: &mut W) { let can_transmit = context.transmission_constraint().can_transmit() || context.transmission_constraint().can_retransmit(); @@ -192,7 +192,7 @@ impl<'a, Config: endpoint::Config> Normal<'a, Config> { } } -impl<'a, Config: endpoint::Config> transmission::interest::Provider for Normal<'a, Config> { +impl transmission::interest::Provider for Normal<'_, Config> { fn transmission_interest( &self, query: &mut Q, @@ -218,7 +218,7 @@ pub struct MtuProbe<'a> { mtu_controller: &'a mut mtu::Controller, } -impl<'a> MtuProbe<'a> { +impl MtuProbe<'_> { fn on_transmit(&mut self, context: &mut W) { if context.transmission_constraint().can_transmit() { self.mtu_controller.on_transmit(context) @@ -226,7 +226,7 @@ impl<'a> MtuProbe<'a> { } } -impl<'a> transmission::interest::Provider for MtuProbe<'a> { +impl transmission::interest::Provider for MtuProbe<'_> { fn transmission_interest( &self, query: &mut Q, @@ -239,7 +239,7 @@ pub struct PathValidationOnly<'a, Config: endpoint::Config> { path: &'a mut path::Path, } -impl<'a, Config: endpoint::Config> PathValidationOnly<'a, Config> { +impl PathValidationOnly<'_, Config> { fn on_transmit(&mut self, context: &mut W) { if context.transmission_constraint().can_transmit() { self.path.on_transmit(context) @@ -247,9 +247,7 @@ impl<'a, Config: endpoint::Config> PathValidationOnly<'a, Config> { } } -impl<'a, Config: endpoint::Config> transmission::interest::Provider - for PathValidationOnly<'a, Config> -{ +impl transmission::interest::Provider for PathValidationOnly<'_, Config> { fn transmission_interest( &self, query: &mut Q, diff --git a/quic/s2n-quic-transport/src/transmission/connection_close.rs b/quic/s2n-quic-transport/src/transmission/connection_close.rs index f9e7278862..9a7c68f231 100644 --- a/quic/s2n-quic-transport/src/transmission/connection_close.rs +++ b/quic/s2n-quic-transport/src/transmission/connection_close.rs @@ -10,7 +10,7 @@ pub struct Payload<'a> { pub connection_close: &'a frame::ConnectionClose<'a>, } -impl<'a> super::Payload for Payload<'a> { +impl super::Payload for Payload<'_> { fn size_hint(&self, range: RangeInclusive) -> usize { (*range.start()).max(self.connection_close.encoding_size()) } @@ -20,7 +20,7 @@ impl<'a> super::Payload for Payload<'a> { } } -impl<'a> transmission::interest::Provider for Payload<'a> { +impl transmission::interest::Provider for Payload<'_> { #[inline] fn transmission_interest( &self, diff --git a/quic/s2n-quic-transport/src/transmission/context.rs b/quic/s2n-quic-transport/src/transmission/context.rs index e966e7f120..9067c39a49 100644 --- a/quic/s2n-quic-transport/src/transmission/context.rs +++ b/quic/s2n-quic-transport/src/transmission/context.rs @@ -28,7 +28,7 @@ pub struct Context<'a, 'b, 'sub, Config: endpoint::Config> { >, } -impl<'a, 'b, 'sub, Config: endpoint::Config> Context<'a, 'b, 'sub, Config> { +impl Context<'_, '_, '_, Config> { #[inline] fn check_frame_constraint(&self, frame: &Frame) { // only apply checks with debug_assertions enabled @@ -61,7 +61,7 @@ impl<'a, 'b, 'sub, Config: endpoint::Config> Context<'a, 'b, 'sub, Config> { } } -impl<'a, 'b, 'sub, Config: endpoint::Config> WriteContext for Context<'a, 'b, 'sub, Config> { +impl WriteContext for Context<'_, '_, '_, Config> { fn current_time(&self) -> Timestamp { self.timestamp } @@ -199,7 +199,7 @@ impl<'a, C: WriteContext> RetransmissionContext<'a, C> { } } -impl<'a, C: WriteContext> WriteContext for RetransmissionContext<'a, C> { +impl WriteContext for RetransmissionContext<'_, C> { #[inline] fn current_time(&self) -> Timestamp { self.context.current_time() diff --git a/quic/s2n-quic-transport/src/transmission/early.rs b/quic/s2n-quic-transport/src/transmission/early.rs index f48227dd81..6ee80964e3 100644 --- a/quic/s2n-quic-transport/src/transmission/early.rs +++ b/quic/s2n-quic-transport/src/transmission/early.rs @@ -17,7 +17,7 @@ pub struct Payload<'a, Config: endpoint::Config> { /// performance, anyway, since you end up paying for encryption/decryption. const MIN_SIZE: usize = 16; -impl<'a, Config: endpoint::Config> super::Payload for Payload<'a, Config> { +impl super::Payload for Payload<'_, Config> { fn size_hint(&self, range: RangeInclusive) -> usize { (*range.start()).max(MIN_SIZE) } @@ -48,7 +48,7 @@ impl<'a, Config: endpoint::Config> super::Payload for Payload<'a, Config> { } } -impl<'a, Config: endpoint::Config> transmission::interest::Provider for Payload<'a, Config> { +impl transmission::interest::Provider for Payload<'_, Config> { fn transmission_interest( &self, query: &mut Q, diff --git a/quic/s2n-quic-transport/src/transmission/mod.rs b/quic/s2n-quic-transport/src/transmission/mod.rs index 840538c689..adb6ae9ecc 100644 --- a/quic/s2n-quic-transport/src/transmission/mod.rs +++ b/quic/s2n-quic-transport/src/transmission/mod.rs @@ -49,8 +49,8 @@ pub struct Transmission<'a, 'sub, Config: endpoint::Config, P: Payload> { pub packet_interceptor: &'a mut ::PacketInterceptor, } -impl<'a, 'sub, Config: endpoint::Config, P: Payload> PacketPayloadEncoder - for Transmission<'a, 'sub, Config, P> +impl PacketPayloadEncoder + for Transmission<'_, '_, Config, P> { fn encoding_size_hint(&mut self, encoder: &E, minimum_len: usize) -> usize { if self.has_transmission_interest() { @@ -126,8 +126,8 @@ impl<'a, 'sub, Config: endpoint::Config, P: Payload> PacketPayloadEncoder } } -impl<'a, 'sub, Config: endpoint::Config, P: Payload> transmission::interest::Provider - for Transmission<'a, 'sub, Config, P> +impl transmission::interest::Provider + for Transmission<'_, '_, Config, P> { fn transmission_interest( &self,