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 D50BAB8819 for ; Tue, 5 Dec 2023 13:31:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B56291AA89 for ; Tue, 5 Dec 2023 13:31:20 +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 ; Tue, 5 Dec 2023 13:31:20 +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 DDBF244C75 for ; Tue, 5 Dec 2023 13:31:19 +0100 (CET) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 5 Dec 2023 13:31:14 +0100 Message-Id: <20231205123115.187815-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lib.rs, ticket.rs, formatter.rs] Subject: [pbs-devel] [PATCH proxmox 1/2] tree-wide: format code using `cargo fmt` 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: Tue, 05 Dec 2023 12:31:20 -0000 Signed-off-by: Lukas Wagner --- proxmox-login/src/ticket.rs | 4 ++-- proxmox-notify/src/lib.rs | 13 ++++++++++--- proxmox-rest-server/src/formatter.rs | 7 +++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/proxmox-login/src/ticket.rs b/proxmox-login/src/ticket.rs index b37952c..9543b70 100644 --- a/proxmox-login/src/ticket.rs +++ b/proxmox-login/src/ticket.rs @@ -240,12 +240,12 @@ impl Authentication { } } -#[cfg(target_arch="wasm32")] +#[cfg(target_arch = "wasm32")] fn epoch_i64() -> i64 { (js_sys::Date::now() / 1000.0) as i64 } -#[cfg(not(target_arch="wasm32"))] +#[cfg(not(target_arch = "wasm32"))] fn epoch_i64() -> i64 { use std::time::{SystemTime, UNIX_EPOCH}; diff --git a/proxmox-notify/src/lib.rs b/proxmox-notify/src/lib.rs index 1fb9623..3f97332 100644 --- a/proxmox-notify/src/lib.rs +++ b/proxmox-notify/src/lib.rs @@ -278,14 +278,21 @@ impl Config { if let Some(obj) = value.as_object_mut() { obj.insert("origin".to_string(), Value::String("builtin".into())); } else { - log::error!("section config entry is not an object. This should not happen"); + log::error!( + "section config entry is not an object. This should not happen" + ); } } else { // Entry is built-in, but it has been modified by the user. if let Some(obj) = value.as_object_mut() { - obj.insert("origin".to_string(), Value::String("modified-builtin".into())); + obj.insert( + "origin".to_string(), + Value::String("modified-builtin".into()), + ); } else { - log::error!("section config entry is not an object. This should not happen"); + log::error!( + "section config entry is not an object. This should not happen" + ); } } } else { diff --git a/proxmox-rest-server/src/formatter.rs b/proxmox-rest-server/src/formatter.rs index d19d680..793d6b1 100644 --- a/proxmox-rest-server/src/formatter.rs +++ b/proxmox-rest-server/src/formatter.rs @@ -223,7 +223,10 @@ impl OutputFormatter for ExtJsFormatter { for (name, err) in param_err { errors.insert(name, err.to_string()); } - (String::from("parameter verification errors"), StatusCode::BAD_REQUEST) + ( + String::from("parameter verification errors"), + StatusCode::BAD_REQUEST, + ) } Err(err) => (err.to_string(), StatusCode::BAD_REQUEST), } @@ -233,7 +236,7 @@ impl OutputFormatter for ExtJsFormatter { } else { StatusCode::BAD_REQUEST }; - (err.to_string(), status) + (err.to_string(), status) }; let result = json!({ -- 2.39.2