From b3be8a127cb9c253aa59de4e09cf99da0075bba4 Mon Sep 17 00:00:00 2001 From: Zhang Jingqiang Date: Fri, 8 Nov 2024 10:35:34 +0800 Subject: [PATCH] fix clippy 1.84 warning --- g3proxy/src/audit/detour/stream.rs | 2 +- g3proxy/src/inspect/http/v1/forward/adaptation.rs | 3 +-- g3proxy/src/serve/http_proxy/task/ftp/list.rs | 8 ++++---- lib/g3-icap-client/src/reqmod/h1/bidirectional.rs | 8 ++++---- lib/g3-icap-client/src/reqmod/h2/bidirectional.rs | 4 ++-- .../src/reqmod/imap/append/bidirectional.rs | 4 ++-- lib/g3-icap-client/src/reqmod/smtp/data/bidirectional.rs | 4 ++-- lib/g3-icap-client/src/respmod/h1/bidirectional.rs | 4 ++-- lib/g3-icap-client/src/respmod/h2/bidirectional.rs | 4 ++-- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/g3proxy/src/audit/detour/stream.rs b/g3proxy/src/audit/detour/stream.rs index 87ae0374..82d16972 100644 --- a/g3proxy/src/audit/detour/stream.rs +++ b/g3proxy/src/audit/detour/stream.rs @@ -43,7 +43,7 @@ impl StreamDetourStream { } } -impl<'a, SC> StreamDetourContext<'a, SC> +impl StreamDetourContext<'_, SC> where SC: ServerConfig, { diff --git a/g3proxy/src/inspect/http/v1/forward/adaptation.rs b/g3proxy/src/inspect/http/v1/forward/adaptation.rs index 8f05b040..4d533900 100644 --- a/g3proxy/src/inspect/http/v1/forward/adaptation.rs +++ b/g3proxy/src/inspect/http/v1/forward/adaptation.rs @@ -60,8 +60,7 @@ where } } -impl<'a, W> HttpRequestUpstreamWriter - for HttpRequestWriterForAdaptation<'a, W> +impl HttpRequestUpstreamWriter for HttpRequestWriterForAdaptation<'_, W> where W: AsyncWrite + Send + Unpin, { diff --git a/g3proxy/src/serve/http_proxy/task/ftp/list.rs b/g3proxy/src/serve/http_proxy/task/ftp/list.rs index 9a4d227b..58aad650 100644 --- a/g3proxy/src/serve/http_proxy/task/ftp/list.rs +++ b/g3proxy/src/serve/http_proxy/task/ftp/list.rs @@ -77,7 +77,7 @@ where } } -impl<'a, W> FtpLineDataReceiver for ChunkedListWriter<'a, W> +impl FtpLineDataReceiver for ChunkedListWriter<'_, W> where W: AsyncWrite + Send + Unpin, { @@ -101,7 +101,7 @@ where } } -impl<'a, W> ListWriter for ChunkedListWriter<'a, W> +impl ListWriter for ChunkedListWriter<'_, W> where W: AsyncWrite + Send + Unpin, { @@ -152,7 +152,7 @@ where } } -impl<'a, W> FtpLineDataReceiver for EndingListWriter<'a, W> +impl FtpLineDataReceiver for EndingListWriter<'_, W> where W: AsyncWrite + Send + Unpin, { @@ -169,7 +169,7 @@ where } } -impl<'a, W> ListWriter for EndingListWriter<'a, W> +impl ListWriter for EndingListWriter<'_, W> where W: AsyncWrite + Send + Unpin, { diff --git a/lib/g3-icap-client/src/reqmod/h1/bidirectional.rs b/lib/g3-icap-client/src/reqmod/h1/bidirectional.rs index 9718ed8f..3546ee67 100644 --- a/lib/g3-icap-client/src/reqmod/h1/bidirectional.rs +++ b/lib/g3-icap-client/src/reqmod/h1/bidirectional.rs @@ -35,7 +35,7 @@ pub(super) struct BidirectionalRecvIcapResponse<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvIcapResponse<'a, I> { +impl BidirectionalRecvIcapResponse<'_, I> { pub(super) async fn transfer_and_recv( self, mut body_transfer: &mut H1BodyToChunkedTransfer<'_, CR, IcapClientWriter>, @@ -100,7 +100,7 @@ impl<'a, I: IdleCheck> BidirectionalRecvIcapResponse<'a, I> { self.icap_client.config.icap_max_header_size, &self.icap_client.config.respond_shared_names, ) - .await?; + .await?; match rsp.code { 204 | 206 => Err(H1ReqmodAdaptationError::IcapServerErrorResponse( @@ -122,7 +122,7 @@ pub(super) struct BidirectionalRecvHttpRequest<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvHttpRequest<'a, I> { +impl BidirectionalRecvHttpRequest<'_, I> { pub(super) async fn transfer( self, state: &mut ReqmodAdaptationRunState, @@ -141,7 +141,7 @@ impl<'a, I: IdleCheck> BidirectionalRecvHttpRequest<'a, I> { http_header_size, self.http_req_add_no_via_header, ) - .await?; + .await?; http_req.set_chunked_encoding(); let final_req = orig_http_request.adapt_to(http_req); diff --git a/lib/g3-icap-client/src/reqmod/h2/bidirectional.rs b/lib/g3-icap-client/src/reqmod/h2/bidirectional.rs index 77ff30f6..5a7c2aae 100644 --- a/lib/g3-icap-client/src/reqmod/h2/bidirectional.rs +++ b/lib/g3-icap-client/src/reqmod/h2/bidirectional.rs @@ -40,7 +40,7 @@ pub(super) struct BidirectionalRecvIcapResponse<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvIcapResponse<'a, I> { +impl BidirectionalRecvIcapResponse<'_, I> { pub(super) async fn transfer_and_recv( self, mut body_transfer: &mut H2StreamToChunkedTransfer<'_, IcapClientWriter>, @@ -127,7 +127,7 @@ pub(super) struct BidirectionalRecvHttpRequest<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvHttpRequest<'a, I> { +impl BidirectionalRecvHttpRequest<'_, I> { pub(super) async fn transfer( mut self, state: &mut ReqmodAdaptationRunState, diff --git a/lib/g3-icap-client/src/reqmod/imap/append/bidirectional.rs b/lib/g3-icap-client/src/reqmod/imap/append/bidirectional.rs index 6c57d4a3..4ab9e446 100644 --- a/lib/g3-icap-client/src/reqmod/imap/append/bidirectional.rs +++ b/lib/g3-icap-client/src/reqmod/imap/append/bidirectional.rs @@ -36,7 +36,7 @@ pub(super) struct BidirectionalRecvIcapResponse<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvIcapResponse<'a, I> { +impl BidirectionalRecvIcapResponse<'_, I> { pub(super) async fn transfer_and_recv( self, mut msg_transfer: &mut LimitedCopy<'_, CR, IcapClientWriter>, @@ -126,7 +126,7 @@ pub(super) struct BidirectionalRecvHttpRequest<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvHttpRequest<'a, I> { +impl BidirectionalRecvHttpRequest<'_, I> { pub(super) async fn transfer( self, state: &mut ReqmodAdaptationRunState, diff --git a/lib/g3-icap-client/src/reqmod/smtp/data/bidirectional.rs b/lib/g3-icap-client/src/reqmod/smtp/data/bidirectional.rs index d2254315..90d18e26 100644 --- a/lib/g3-icap-client/src/reqmod/smtp/data/bidirectional.rs +++ b/lib/g3-icap-client/src/reqmod/smtp/data/bidirectional.rs @@ -35,7 +35,7 @@ pub(super) struct BidirectionalRecvIcapResponse<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvIcapResponse<'a, I> { +impl BidirectionalRecvIcapResponse<'_, I> { pub(super) async fn transfer_and_recv( self, mut msg_transfer: &mut StreamToChunkedTransfer<'_, CR, BufWriter<&'_ mut IcapClientWriter>>, @@ -118,7 +118,7 @@ pub(super) struct BidirectionalRecvHttpRequest<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvHttpRequest<'a, I> { +impl BidirectionalRecvHttpRequest<'_, I> { pub(super) async fn transfer( self, state: &mut ReqmodAdaptationRunState, diff --git a/lib/g3-icap-client/src/respmod/h1/bidirectional.rs b/lib/g3-icap-client/src/respmod/h1/bidirectional.rs index 73a115c5..6d1c2bd3 100644 --- a/lib/g3-icap-client/src/respmod/h1/bidirectional.rs +++ b/lib/g3-icap-client/src/respmod/h1/bidirectional.rs @@ -35,7 +35,7 @@ pub(super) struct BidirectionalRecvIcapResponse<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvIcapResponse<'a, I> { +impl BidirectionalRecvIcapResponse<'_, I> { pub(super) async fn transfer_and_recv( self, mut body_transfer: &mut H1BodyToChunkedTransfer<'_, UR, IcapClientWriter>, @@ -120,7 +120,7 @@ pub(super) struct BidirectionalRecvHttpResponse<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvHttpResponse<'a, I> { +impl BidirectionalRecvHttpResponse<'_, I> { pub(super) async fn transfer( self, state: &mut RespmodAdaptationRunState, diff --git a/lib/g3-icap-client/src/respmod/h2/bidirectional.rs b/lib/g3-icap-client/src/respmod/h2/bidirectional.rs index e5be3272..4f3ed19b 100644 --- a/lib/g3-icap-client/src/respmod/h2/bidirectional.rs +++ b/lib/g3-icap-client/src/respmod/h2/bidirectional.rs @@ -38,7 +38,7 @@ pub(super) struct BidirectionalRecvIcapResponse<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvIcapResponse<'a, I> { +impl BidirectionalRecvIcapResponse<'_, I> { pub(super) async fn transfer_and_recv( self, mut body_transfer: &mut H2StreamToChunkedTransfer<'_, IcapClientWriter>, @@ -122,7 +122,7 @@ pub(super) struct BidirectionalRecvHttpResponse<'a, I: IdleCheck> { pub(super) idle_checker: &'a I, } -impl<'a, I: IdleCheck> BidirectionalRecvHttpResponse<'a, I> { +impl BidirectionalRecvHttpResponse<'_, I> { pub(super) async fn transfer( mut self, state: &mut RespmodAdaptationRunState,