diff --git a/neqo-bin/src/client/http09.rs b/neqo-bin/src/client/http09.rs index 9f99da9888..2f31928058 100644 --- a/neqo-bin/src/client/http09.rs +++ b/neqo-bin/src/client/http09.rs @@ -39,7 +39,7 @@ pub struct Handler<'a> { read_buffer: Vec, } -impl<'a> Handler<'a> { +impl Handler<'_> { fn reinit(&mut self) { for url in self.handled_urls.drain(..) { self.url_queue.push_front(url); @@ -49,7 +49,7 @@ impl<'a> Handler<'a> { } } -impl<'a> super::Handler for Handler<'a> { +impl super::Handler for Handler<'_> { type Client = Connection; fn handle(&mut self, client: &mut Self::Client) -> Res { @@ -255,7 +255,8 @@ impl<'b> Handler<'b> { .stream_send(client_stream_id, req.as_bytes()) .unwrap(); client.stream_close_send(client_stream_id).unwrap(); - let out_file = get_output_file(&url, &self.args.output_dir, &mut self.all_paths); + let out_file = + get_output_file(&url, self.args.output_dir.as_ref(), &mut self.all_paths); self.streams.insert(client_stream_id, out_file); self.handled_urls.push(url); true diff --git a/neqo-bin/src/client/http3.rs b/neqo-bin/src/client/http3.rs index 6031742c02..0413338672 100644 --- a/neqo-bin/src/client/http3.rs +++ b/neqo-bin/src/client/http3.rs @@ -155,7 +155,7 @@ impl super::Client for Http3Client { } } -impl<'a> Handler<'a> { +impl Handler<'_> { fn reinit(&mut self) { for url in self.url_handler.handled_urls.drain(..) { self.url_handler.url_queue.push_front(url); @@ -165,7 +165,7 @@ impl<'a> Handler<'a> { } } -impl<'a> super::Handler for Handler<'a> { +impl super::Handler for Handler<'_> { type Client = Http3Client; fn handle(&mut self, client: &mut Http3Client) -> Res { @@ -286,7 +286,7 @@ impl StreamHandlerType { ) -> Box { match handler_type { Self::Download => { - let out_file = get_output_file(url, &args.output_dir, all_paths); + let out_file = get_output_file(url, args.output_dir.as_ref(), all_paths); client.stream_close_send(client_stream_id).unwrap(); Box::new(DownloadStreamHandler { out_file }) } @@ -406,7 +406,7 @@ struct UrlHandler<'a> { args: &'a Args, } -impl<'a> UrlHandler<'a> { +impl UrlHandler<'_> { fn stream_handler(&mut self, stream_id: StreamId) -> Option<&mut Box> { self.stream_handlers.get_mut(&stream_id) } diff --git a/neqo-bin/src/client/mod.rs b/neqo-bin/src/client/mod.rs index 863b34dced..096052a4fc 100644 --- a/neqo-bin/src/client/mod.rs +++ b/neqo-bin/src/client/mod.rs @@ -298,10 +298,10 @@ impl Args { fn get_output_file( url: &Url, - output_dir: &Option, + output_dir: Option<&PathBuf>, all_paths: &mut Vec, ) -> Option> { - if let Some(ref dir) = output_dir { + if let Some(dir) = output_dir { let mut out_path = dir.clone(); let url_path = if url.path() == "/" { diff --git a/neqo-bin/src/lib.rs b/neqo-bin/src/lib.rs index 5051faae3d..79e99ccf22 100644 --- a/neqo-bin/src/lib.rs +++ b/neqo-bin/src/lib.rs @@ -155,7 +155,7 @@ impl Default for QuicParameters { } impl QuicParameters { - fn get_sock_addr(opt: &Option, v: &str, f: F) -> Option + fn get_sock_addr(opt: Option<&String>, v: &str, f: F) -> Option where F: FnMut(&SocketAddr) -> bool, { @@ -176,12 +176,20 @@ impl QuicParameters { #[must_use] pub fn preferred_address_v4(&self) -> Option { - Self::get_sock_addr(&self.preferred_address_v4, "IPv4", SocketAddr::is_ipv4) + Self::get_sock_addr( + self.preferred_address_v4.as_ref(), + "IPv4", + SocketAddr::is_ipv4, + ) } #[must_use] pub fn preferred_address_v6(&self) -> Option { - Self::get_sock_addr(&self.preferred_address_v6, "IPv6", SocketAddr::is_ipv6) + Self::get_sock_addr( + self.preferred_address_v6.as_ref(), + "IPv6", + SocketAddr::is_ipv6, + ) } #[must_use] diff --git a/neqo-common/src/codec.rs b/neqo-common/src/codec.rs index 325f088856..afeb095781 100644 --- a/neqo-common/src/codec.rs +++ b/neqo-common/src/codec.rs @@ -163,7 +163,7 @@ impl<'a> AsRef<[u8]> for Decoder<'a> { } } -impl<'a> Debug for Decoder<'a> { +impl Debug for Decoder<'_> { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { f.write_str(&hex_with_len(self.as_ref())) } @@ -186,7 +186,7 @@ where } } -impl<'a, 'b> PartialEq> for Decoder<'a> { +impl<'b> PartialEq> for Decoder<'_> { #[must_use] fn eq(&self, other: &Decoder<'b>) -> bool { self.buf == other.buf diff --git a/neqo-common/src/event.rs b/neqo-common/src/event.rs index ea8d491822..addd0bb18b 100644 --- a/neqo-common/src/event.rs +++ b/neqo-common/src/event.rs @@ -41,7 +41,7 @@ where } } -impl<'a, P, E> Iterator for Iter<'a, P, E> +impl Iterator for Iter<'_, P, E> where P: Provider, { diff --git a/neqo-crypto/src/agentio.rs b/neqo-crypto/src/agentio.rs index 03aab9e0b5..f2173bfd8d 100644 --- a/neqo-crypto/src/agentio.rs +++ b/neqo-crypto/src/agentio.rs @@ -142,7 +142,7 @@ pub struct AgentIoInputContext<'a> { input: &'a mut AgentIoInput, } -impl<'a> Drop for AgentIoInputContext<'a> { +impl Drop for AgentIoInputContext<'_> { fn drop(&mut self) { self.input.reset(); } diff --git a/neqo-http3/src/features/extended_connect/tests/webtransport/mod.rs b/neqo-http3/src/features/extended_connect/tests/webtransport/mod.rs index 8e9da9cc14..1aae3d97e4 100644 --- a/neqo-http3/src/features/extended_connect/tests/webtransport/mod.rs +++ b/neqo-http3/src/features/extended_connect/tests/webtransport/mod.rs @@ -221,7 +221,7 @@ impl WtTest { e: &Http3ClientEvent, id: StreamId, expected_reason: &SessionCloseReason, - expected_headers: &Option>, + expected_headers: Option<&Vec
>, ) -> bool { if let Http3ClientEvent::WebTransport(WebTransportEvent::SessionClosed { stream_id, @@ -229,7 +229,7 @@ impl WtTest { headers, }) = e { - *stream_id == id && reason == expected_reason && headers == expected_headers + *stream_id == id && reason == expected_reason && headers.as_ref() == expected_headers } else { false } @@ -239,7 +239,7 @@ impl WtTest { &mut self, wt_session_id: StreamId, expected_reason: &SessionCloseReason, - expected_headers: &Option>, + expected_headers: Option<&Vec
>, ) { let mut event_found = false; @@ -404,7 +404,7 @@ impl WtTest { expected_stop_sending_ids: &[StreamId], expected_error_stream_stop_sending: Option, expected_local: bool, - expected_session_close: &Option<(StreamId, SessionCloseReason)>, + expected_session_close: Option<&(StreamId, SessionCloseReason)>, ) { let mut reset_ids_count = 0; let mut stop_sending_ids_count = 0; @@ -546,7 +546,7 @@ impl WtTest { expected_error_stream_reset: Option, expected_stop_sending_ids: &[StreamId], expected_error_stream_stop_sending: Option, - expected_session_close: &Option<(StreamId, SessionCloseReason)>, + expected_session_close: Option<&(StreamId, SessionCloseReason)>, ) { let mut reset_ids_count = 0; let mut stop_sending_ids_count = 0; diff --git a/neqo-http3/src/features/extended_connect/tests/webtransport/sessions.rs b/neqo-http3/src/features/extended_connect/tests/webtransport/sessions.rs index 31337ce039..d184f2d6a2 100644 --- a/neqo-http3/src/features/extended_connect/tests/webtransport/sessions.rs +++ b/neqo-http3/src/features/extended_connect/tests/webtransport/sessions.rs @@ -39,7 +39,7 @@ fn wt_session_reject() { wt.check_session_closed_event_client( wt_session_id, &SessionCloseReason::Status(404), - &Some(headers), + Some(&headers), ); } @@ -64,7 +64,7 @@ fn wt_session_close_server() { wt.check_session_closed_event_client( wt_session.stream_id(), &SessionCloseReason::Error(Error::HttpNoError.code()), - &None, + None, ); } @@ -81,7 +81,7 @@ fn wt_session_close_server_close_send() { error: 0, message: String::new(), }, - &None, + None, ); } @@ -97,7 +97,7 @@ fn wt_session_close_server_stop_sending() { wt.check_session_closed_event_client( wt_session.stream_id(), &SessionCloseReason::Error(Error::HttpNoError.code()), - &None, + None, ); } @@ -113,7 +113,7 @@ fn wt_session_close_server_reset() { wt.check_session_closed_event_client( wt_session.stream_id(), &SessionCloseReason::Error(Error::HttpNoError.code()), - &None, + None, ); } @@ -189,7 +189,7 @@ fn wt_session_response_with_redirect() { wt.check_session_closed_event_client( wt_session_id, &SessionCloseReason::Status(302), - &Some(headers), + Some(&headers), ); } @@ -284,7 +284,7 @@ fn wt_session_close_frame_server() { error: ERROR_NUM, message: ERROR_MESSAGE.to_string(), }, - &None, + None, ); } @@ -321,14 +321,14 @@ fn wt_unknown_session_frame_client() { &[], None, false, - &None, + None, ); wt.check_events_after_closing_session_server( &[], None, &[unidi_server.stream_id()], Some(Error::HttpRequestCancelled.code()), - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Clean { error: ERROR_NUM, @@ -360,7 +360,7 @@ fn wt_close_session_frame_broken_client() { wt.check_session_closed_event_client( wt_session.stream_id(), &SessionCloseReason::Error(Error::HttpGeneralProtocolStream.code()), - &None, + None, ); wt.check_session_closed_event_server( &wt_session, @@ -444,7 +444,7 @@ fn wt_close_session_cannot_be_sent_at_once() { &[unidi_client], Some(Error::HttpRequestCancelled.code()), false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Clean { error: ERROR_NUM, @@ -452,5 +452,5 @@ fn wt_close_session_cannot_be_sent_at_once() { }, )), ); - wt.check_events_after_closing_session_server(&[], None, &[], None, &None); + wt.check_events_after_closing_session_server(&[], None, &[], None, None); } diff --git a/neqo-http3/src/features/extended_connect/tests/webtransport/streams.rs b/neqo-http3/src/features/extended_connect/tests/webtransport/streams.rs index 682b7589b0..07a761206f 100644 --- a/neqo-http3/src/features/extended_connect/tests/webtransport/streams.rs +++ b/neqo-http3/src/features/extended_connect/tests/webtransport/streams.rs @@ -324,7 +324,7 @@ fn wt_client_session_close_1() { Some(Error::HttpRequestCancelled.code()), &[bidi_from_client], Some(Error::HttpRequestCancelled.code()), - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -336,7 +336,7 @@ fn wt_client_session_close_1() { &[bidi_from_client], Some(Error::HttpRequestCancelled.code()), false, - &None, + None, ); } @@ -359,7 +359,7 @@ fn wt_client_session_close_2() { Some(Error::HttpRequestCancelled.code()), &[], None, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -371,7 +371,7 @@ fn wt_client_session_close_2() { &[unidi_from_client], Some(Error::HttpRequestCancelled.code()), false, - &None, + None, ); } @@ -395,13 +395,13 @@ fn wt_client_session_close_3() { None, &[], None, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_client(&[], None, &[], None, false, &None); + wt.check_events_after_closing_session_client(&[], None, &[], None, false, None); } #[test] @@ -424,7 +424,7 @@ fn wt_client_session_close_4() { None, &[], None, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -436,7 +436,7 @@ fn wt_client_session_close_4() { &[unidi_from_client], Some(Error::HttpNoError.code()), false, - &None, + None, ); } @@ -460,13 +460,13 @@ fn wt_client_session_close_5() { Some(Error::HttpNoError.code()), &[], None, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_client(&[], None, &[], None, false, &None); + wt.check_events_after_closing_session_client(&[], None, &[], None, false, None); } #[test] @@ -487,7 +487,7 @@ fn wt_client_session_close_6() { Some(Error::HttpRequestCancelled.code()), &[bidi_from_server.stream_id()], Some(Error::HttpRequestCancelled.code()), - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -499,7 +499,7 @@ fn wt_client_session_close_6() { &[bidi_from_server.stream_id()], Some(Error::HttpRequestCancelled.code()), false, - &None, + None, ); } @@ -521,7 +521,7 @@ fn wt_client_session_close_7() { None, &[unidi_from_server.stream_id()], Some(Error::HttpRequestCancelled.code()), - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -533,7 +533,7 @@ fn wt_client_session_close_7() { &[], None, false, - &None, + None, ); } @@ -556,13 +556,13 @@ fn wt_client_session_close_8() { None, &[], None, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_client(&[], None, &[], None, false, &None); + wt.check_events_after_closing_session_client(&[], None, &[], None, false, None); } #[test] @@ -583,13 +583,13 @@ fn wt_client_session_close_9() { None, &[unidi_server.stream_id()], Some(Error::HttpNoError.code()), - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_client(&[], None, &[], None, false, &None); + wt.check_events_after_closing_session_client(&[], None, &[], None, false, None); } #[test] @@ -610,7 +610,7 @@ fn wt_client_session_close_10() { None, &[], None, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -622,7 +622,7 @@ fn wt_client_session_close_10() { &[], None, false, - &None, + None, ); } @@ -647,13 +647,13 @@ fn wt_client_session_close_11() { None, &[], None, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_client(&[], None, &[], None, false, &None); + wt.check_events_after_closing_session_client(&[], None, &[], None, false, None); } #[test] @@ -675,7 +675,7 @@ fn wt_client_session_close_12() { None, &[], None, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -687,7 +687,7 @@ fn wt_client_session_close_12() { &[bidi_server.stream_id()], Some(Error::HttpNoError.code()), false, - &None, + None, ); } @@ -712,7 +712,7 @@ fn wt_client_session_close_13() { Some(Error::HttpRequestCancelled.code()), &[bidi_client_1, bidi_client_2], Some(Error::HttpRequestCancelled.code()), - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -724,7 +724,7 @@ fn wt_client_session_close_13() { &[bidi_client_1, bidi_client_2], Some(Error::HttpRequestCancelled.code()), false, - &None, + None, ); } @@ -760,7 +760,7 @@ fn wt_client_session_server_close_1() { &[bidi_client], Some(Error::HttpRequestCancelled.code()), false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -771,7 +771,7 @@ fn wt_client_session_server_close_1() { Some(Error::HttpRequestCancelled.code()), &[bidi_client], Some(Error::HttpRequestCancelled.code()), - &None, + None, ); } @@ -794,7 +794,7 @@ fn wt_client_session_server_close_2() { &[unidi_client], Some(Error::HttpRequestCancelled.code()), false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -805,7 +805,7 @@ fn wt_client_session_server_close_2() { Some(Error::HttpRequestCancelled.code()), &[], None, - &None, + None, ); } @@ -830,13 +830,13 @@ fn wt_client_session_server_close_3() { &[], None, false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_server(&[], None, &[], None, &None); + wt.check_events_after_closing_session_server(&[], None, &[], None, None); } #[test] @@ -859,13 +859,13 @@ fn wt_client_session_server_close_4() { &[unidi_client], Some(Error::HttpNoError.code()), false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_server(&[], None, &[], None, &None); + wt.check_events_after_closing_session_server(&[], None, &[], None, None); } #[test] @@ -887,7 +887,7 @@ fn wt_client_session_server_close_5() { &[bidi_server.stream_id()], Some(Error::HttpRequestCancelled.code()), false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -898,7 +898,7 @@ fn wt_client_session_server_close_5() { Some(Error::HttpRequestCancelled.code()), &[bidi_server.stream_id()], Some(Error::HttpRequestCancelled.code()), - &None, + None, ); } @@ -921,7 +921,7 @@ fn wt_client_session_server_close_6() { &[], None, false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -931,7 +931,7 @@ fn wt_client_session_server_close_6() { None, &[unidi_server.stream_id()], Some(Error::HttpRequestCancelled.code()), - &None, + None, ); } @@ -956,13 +956,13 @@ fn wt_client_session_server_close_7() { &[], None, false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_server(&[], None, &[], None, &None); + wt.check_events_after_closing_session_server(&[], None, &[], None, None); } #[test] @@ -985,13 +985,13 @@ fn wt_client_session_server_close_8() { &[], None, false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_server(&[], None, &[], None, &None); + wt.check_events_after_closing_session_server(&[], None, &[], None, None); } #[test] @@ -1017,13 +1017,13 @@ fn wt_client_session_server_close_9() { &[], None, false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_server(&[], None, &[], None, &None); + wt.check_events_after_closing_session_server(&[], None, &[], None, None); } #[test] @@ -1046,13 +1046,13 @@ fn wt_client_session_server_close_10() { &[bidi_server.stream_id()], Some(Error::HttpNoError.code()), false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), ); - wt.check_events_after_closing_session_server(&[], None, &[], None, &None); + wt.check_events_after_closing_session_server(&[], None, &[], None, None); } #[test] @@ -1077,7 +1077,7 @@ fn wt_client_session_server_close_11() { &[bidi_client_1, bidi_client_2], Some(Error::HttpRequestCancelled.code()), false, - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Error(Error::HttpNoError.code()), )), @@ -1088,7 +1088,7 @@ fn wt_client_session_server_close_11() { Some(Error::HttpRequestCancelled.code()), &[bidi_client_1, bidi_client_2], Some(Error::HttpRequestCancelled.code()), - &None, + None, ); } @@ -1111,7 +1111,7 @@ fn wt_session_close_frame_and_streams_client() { &[], None, false, - &None, + None, ); wt.exchange_packets(); @@ -1120,7 +1120,7 @@ fn wt_session_close_frame_and_streams_client() { None, &[unidi_server.stream_id()], Some(Error::HttpRequestCancelled.code()), - &Some(( + Some(&( wt_session.stream_id(), SessionCloseReason::Clean { error: ERROR_NUM, diff --git a/neqo-http3/src/frames/reader.rs b/neqo-http3/src/frames/reader.rs index 96cb78912b..bd1f0811b6 100644 --- a/neqo-http3/src/frames/reader.rs +++ b/neqo-http3/src/frames/reader.rs @@ -55,7 +55,7 @@ impl<'a> StreamReaderConnectionWrapper<'a> { } } -impl<'a> StreamReader for StreamReaderConnectionWrapper<'a> { +impl StreamReader for StreamReaderConnectionWrapper<'_> { /// # Errors /// /// An error may happen while reading a stream, e.g. early close, protocol error, etc. @@ -76,7 +76,7 @@ impl<'a> StreamReaderRecvStreamWrapper<'a> { } } -impl<'a> StreamReader for StreamReaderRecvStreamWrapper<'a> { +impl StreamReader for StreamReaderRecvStreamWrapper<'_> { /// # Errors /// /// An error may happen while reading a stream, e.g. early close, protocol error, etc. diff --git a/neqo-qpack/src/encoder_instructions.rs b/neqo-qpack/src/encoder_instructions.rs index c1fa4c37d8..1a513bd461 100644 --- a/neqo-qpack/src/encoder_instructions.rs +++ b/neqo-qpack/src/encoder_instructions.rs @@ -32,7 +32,7 @@ pub enum EncoderInstruction<'a> { NoInstruction, } -impl<'a> EncoderInstruction<'a> { +impl EncoderInstruction<'_> { pub(crate) fn marshal(&self, enc: &mut QpackData, use_huffman: bool) { match self { Self::Capacity { value } => { diff --git a/neqo-qpack/src/header_block.rs b/neqo-qpack/src/header_block.rs index 416b4c8200..1c5072ee96 100644 --- a/neqo-qpack/src/header_block.rs +++ b/neqo-qpack/src/header_block.rs @@ -178,7 +178,7 @@ pub struct HeaderDecoder<'a> { req_insert_cnt: u64, } -impl<'a> ::std::fmt::Display for HeaderDecoder<'a> { +impl ::std::fmt::Display for HeaderDecoder<'_> { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { write!(f, "HeaderDecoder") } diff --git a/neqo-qpack/src/reader.rs b/neqo-qpack/src/reader.rs index c408b3d62c..1b28ab3f7c 100644 --- a/neqo-qpack/src/reader.rs +++ b/neqo-qpack/src/reader.rs @@ -32,7 +32,7 @@ pub(crate) struct ReceiverConnWrapper<'a> { stream_id: StreamId, } -impl<'a> ReadByte for ReceiverConnWrapper<'a> { +impl ReadByte for ReceiverConnWrapper<'_> { fn read_byte(&mut self) -> Res { let mut b = [0]; match self.conn.stream_recv(self.stream_id, &mut b)? { @@ -43,7 +43,7 @@ impl<'a> ReadByte for ReceiverConnWrapper<'a> { } } -impl<'a> Reader for ReceiverConnWrapper<'a> { +impl Reader for ReceiverConnWrapper<'_> { fn read(&mut self, buf: &mut [u8]) -> Res { match self.conn.stream_recv(self.stream_id, buf)? { (_, true) => Err(Error::ClosedCriticalStream), @@ -66,7 +66,7 @@ pub(crate) struct ReceiverBufferWrapper<'a> { offset: usize, } -impl<'a> ReadByte for ReceiverBufferWrapper<'a> { +impl ReadByte for ReceiverBufferWrapper<'_> { fn read_byte(&mut self) -> Res { if self.offset == self.buf.len() { Err(Error::DecompressionFailed) diff --git a/neqo-transport/src/cid.rs b/neqo-transport/src/cid.rs index 767b5242ad..ce6a060063 100644 --- a/neqo-transport/src/cid.rs +++ b/neqo-transport/src/cid.rs @@ -124,13 +124,13 @@ pub struct ConnectionIdRef<'a> { cid: &'a [u8], } -impl<'a> ::std::fmt::Debug for ConnectionIdRef<'a> { +impl ::std::fmt::Debug for ConnectionIdRef<'_> { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { write!(f, "CID {}", hex_with_len(self.cid)) } } -impl<'a> ::std::fmt::Display for ConnectionIdRef<'a> { +impl ::std::fmt::Display for ConnectionIdRef<'_> { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { write!(f, "{}", hex(self.cid)) } @@ -142,7 +142,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> From<&'a T> for ConnectionIdRef<'a> { } } -impl<'a> std::ops::Deref for ConnectionIdRef<'a> { +impl std::ops::Deref for ConnectionIdRef<'_> { type Target = [u8]; fn deref(&self) -> &Self::Target { @@ -150,7 +150,7 @@ impl<'a> std::ops::Deref for ConnectionIdRef<'a> { } } -impl<'a> PartialEq for ConnectionIdRef<'a> { +impl PartialEq for ConnectionIdRef<'_> { fn eq(&self, other: &ConnectionId) -> bool { self.cid == &other.cid[..] } diff --git a/neqo-transport/src/connection/mod.rs b/neqo-transport/src/connection/mod.rs index 09f9f00373..3aed604c9c 100644 --- a/neqo-transport/src/connection/mod.rs +++ b/neqo-transport/src/connection/mod.rs @@ -1976,7 +1976,7 @@ impl Connection { | State::Confirmed => self.paths.select_path().map_or_else( || Ok(SendOption::default()), |path| { - let res = self.output_path(&path, now, &None); + let res = self.output_path(&path, now, None); self.capture_error(Some(path), now, 0, res) }, ), @@ -1993,7 +1993,7 @@ impl Connection { qerror!([self], "Attempting to close with a temporary path"); Err(Error::InternalError) } else { - self.output_path(&path, now, &Some(details)) + self.output_path(&path, now, Some(&details)) }; self.capture_error(Some(path), now, 0, res) }, @@ -2324,7 +2324,7 @@ impl Connection { &mut self, path: &PathRef, now: Instant, - closing_frame: &Option, + closing_frame: Option<&ClosingFrame>, ) -> Res { let mut initial_sent = None; let mut needs_padding = false; @@ -2385,7 +2385,7 @@ impl Connection { // Add frames to the packet. let payload_start = builder.len(); let (mut tokens, mut ack_eliciting, mut padded) = (Vec::new(), false, false); - if let Some(ref close) = closing_frame { + if let Some(close) = closing_frame { self.write_closing_frames(close, &mut builder, *space, now, path, &mut tokens); } else { (tokens, ack_eliciting, padded) = diff --git a/neqo-transport/src/send_stream.rs b/neqo-transport/src/send_stream.rs index 3f0002da13..3ef42e9957 100644 --- a/neqo-transport/src/send_stream.rs +++ b/neqo-transport/src/send_stream.rs @@ -1487,7 +1487,7 @@ impl OrderGroup { } } -impl<'a> Iterator for OrderGroupIter<'a> { +impl Iterator for OrderGroupIter<'_> { type Item = StreamId; fn next(&mut self) -> Option { // Stop when we would return the started_at element on the next diff --git a/neqo-transport/tests/connection.rs b/neqo-transport/tests/connection.rs index 604737ed8e..f3e4be31c5 100644 --- a/neqo-transport/tests/connection.rs +++ b/neqo-transport/tests/connection.rs @@ -196,7 +196,7 @@ fn ack_for_unsent() { ); } -fn set_payload(server_packet: &Option, client_dcid: &[u8], payload: &[u8]) -> Datagram { +fn set_payload(server_packet: Option<&Datagram>, client_dcid: &[u8], payload: &[u8]) -> Datagram { let (server_initial, _server_hs) = split_datagram(server_packet.as_ref().unwrap()); let (protected_header, _, _, orig_payload) = decode_initial_header(&server_initial, Role::Server).unwrap(); @@ -239,7 +239,7 @@ fn packet_without_frames() { decode_initial_header(client_initial.as_dgram_ref().unwrap(), Role::Client).unwrap(); let server_packet = server.process(client_initial.as_dgram_ref(), now()).dgram(); - let modified = set_payload(&server_packet, client_dcid, &[]); + let modified = set_payload(server_packet.as_ref(), client_dcid, &[]); client.process_input(&modified, now()); assert_eq!( client.state(), @@ -260,7 +260,7 @@ fn packet_with_only_padding() { decode_initial_header(client_initial.as_dgram_ref().unwrap(), Role::Client).unwrap(); let server_packet = server.process(client_initial.as_dgram_ref(), now()).dgram(); - let modified = set_payload(&server_packet, client_dcid, &[0]); + let modified = set_payload(server_packet.as_ref(), client_dcid, &[0]); client.process_input(&modified, now()); assert_eq!(client.state(), &State::WaitInitial); }