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 D3FA16CF0B for ; Wed, 31 Mar 2021 12:22:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9CD4DDE3C for ; Wed, 31 Mar 2021 12:22:25 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 03E3BDDC6 for ; Wed, 31 Mar 2021 12:22:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2E87445980 for ; Wed, 31 Mar 2021 12:22:23 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Wed, 31 Mar 2021 12:21:45 +0200 Message-Id: <20210331102202.14767-4-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210331102202.14767-1-s.reiter@proxmox.com> References: <20210331102202.14767-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.019 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 v3 proxmox-backup 03/20] vsock_client: remove some &mut restrictions and rustfmt 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: Wed, 31 Mar 2021 10:22:25 -0000 Signed-off-by: Stefan Reiter --- new in v3 src/client/vsock_client.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/client/vsock_client.rs b/src/client/vsock_client.rs index 5002b53d..a7740ac2 100644 --- a/src/client/vsock_client.rs +++ b/src/client/vsock_client.rs @@ -12,7 +12,7 @@ use hyper::client::Client; use hyper::Body; use pin_project::pin_project; use serde_json::Value; -use tokio::io::{ReadBuf, AsyncRead, AsyncWrite, AsyncWriteExt}; +use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, ReadBuf}; use tokio::net::UnixStream; use crate::tools; @@ -151,13 +151,13 @@ impl VsockClient { self.api_request(req).await } - pub async fn post(&mut self, path: &str, data: Option) -> Result { + pub async fn post(&self, path: &str, data: Option) -> Result { let req = Self::request_builder(self.cid, self.port, "POST", path, data)?; self.api_request(req).await } pub async fn download( - &mut self, + &self, path: &str, data: Option, output: &mut (dyn AsyncWrite + Send + Unpin), @@ -166,14 +166,13 @@ impl VsockClient { let client = self.client.clone(); - let resp = client.request(req) + let resp = client + .request(req) .await .map_err(|_| format_err!("vsock download request timed out"))?; let status = resp.status(); if !status.is_success() { - Self::api_response(resp) - .await - .map(|_| ())? + Self::api_response(resp).await.map(|_| ())? } else { resp.into_body() .map_err(Error::from) -- 2.20.1