From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 005008480 for ; Fri, 3 Mar 2023 12:40:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC9ACD8EE for ; Fri, 3 Mar 2023 12:39:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 3 Mar 2023 12:39:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DED5241CD4 for ; Fri, 3 Mar 2023 12:39:46 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 3 Mar 2023 12:39:24 +0100 Message-Id: <20230303113924.389256-5-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230303113924.389256-1-f.gruenbichler@proxmox.com> References: <20230303113924.389256-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.123 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox 4/4] http: sync: drop unused &self parameter X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2023 11:40:18 -0000 these are just internal helpers, changing their signature is fine. Signed-off-by: Fabian Grünbichler --- proxmox-http/src/client/sync.rs | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/proxmox-http/src/client/sync.rs b/proxmox-http/src/client/sync.rs index 3485f84..ea081a7 100644 --- a/proxmox-http/src/client/sync.rs +++ b/proxmox-http/src/client/sync.rs @@ -33,11 +33,11 @@ impl Client { Ok(builder.build()) } - fn call(&self, req: ureq::Request) -> Result { + fn call(req: ureq::Request) -> Result { req.call().map_err(Into::into) } - fn send(&self, req: ureq::Request, body: R) -> Result + fn send(req: ureq::Request, body: R) -> Result where R: Read, { @@ -105,7 +105,7 @@ impl HttpClient for Client { let req = self.agent()?.get(uri); let req = Self::add_headers(req, None, extra_headers); - self.call(req).and_then(Self::convert_response_to_string) + Self::call(req).and_then(Self::convert_response_to_string) } fn post( @@ -119,8 +119,8 @@ impl HttpClient for Client { let req = Self::add_headers(req, content_type, extra_headers); match body { - Some(body) => self.send(req, body.as_bytes()), - None => self.call(req), + Some(body) => Self::send(req, body.as_bytes()), + None => Self::call(req), } .and_then(Self::convert_response_to_string) } @@ -138,8 +138,7 @@ impl HttpClient for Client { } } - self.send(req, request.body().as_bytes()) - .and_then(Self::convert_response_to_string) + Self::send(req, request.body().as_bytes()).and_then(Self::convert_response_to_string) } } @@ -152,7 +151,7 @@ impl HttpClient<&[u8], Vec> for Client { let req = self.agent()?.get(uri); let req = Self::add_headers(req, None, extra_headers); - self.call(req).and_then(Self::convert_response_to_vec) + Self::call(req).and_then(Self::convert_response_to_vec) } fn post( @@ -166,8 +165,8 @@ impl HttpClient<&[u8], Vec> for Client { let req = Self::add_headers(req, content_type, extra_headers); match body { - Some(body) => self.send(req, body), - None => self.call(req), + Some(body) => Self::send(req, body), + None => Self::call(req), } .and_then(Self::convert_response_to_vec) } @@ -185,8 +184,7 @@ impl HttpClient<&[u8], Vec> for Client { } } - self.send(req, *request.body()) - .and_then(Self::convert_response_to_vec) + Self::send(req, *request.body()).and_then(Self::convert_response_to_vec) } } @@ -199,7 +197,7 @@ impl HttpClient, Box> for Client { let req = self.agent()?.get(uri); let req = Self::add_headers(req, None, extra_headers); - self.call(req).and_then(Self::convert_response_to_reader) + Self::call(req).and_then(Self::convert_response_to_reader) } fn post( @@ -213,8 +211,8 @@ impl HttpClient, Box> for Client { let req = Self::add_headers(req, content_type, extra_headers); match body { - Some(body) => self.send(req, body), - None => self.call(req), + Some(body) => Self::send(req, body), + None => Self::call(req), } .and_then(Self::convert_response_to_reader) } @@ -234,7 +232,6 @@ impl HttpClient, Box> for Client { } } - self.send(req, Box::new(request.body_mut())) - .and_then(Self::convert_response_to_reader) + Self::send(req, Box::new(request.body_mut())).and_then(Self::convert_response_to_reader) } } -- 2.30.2