From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pdm-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 554611FF1B6
for <inbox@lore.proxmox.com>; Mon, 13 Jan 2025 15:28:21 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id A7878F46;
Mon, 13 Jan 2025 15:28:01 +0100 (CET)
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pdm-devel@lists.proxmox.com
Date: Mon, 13 Jan 2025 15:27:19 +0100
Message-Id: <20250113142725.523748-9-m.sandoval@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250113142725.523748-1-m.sandoval@proxmox.com>
References: <20250113142725.523748-1-m.sandoval@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.053 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
URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist
[185.199.110.153, 185.199.111.153, 185.199.108.153, 185.199.109.153]
Subject: [pdm-devel] [PATCH proxmox-yew-comp 09/15] use or_default and
unwrap_or_default
X-BeenThere: pdm-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Datacenter Manager development discussion
<pdm-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/>
List-Post: <mailto:pdm-devel@lists.proxmox.com>
List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Datacenter Manager development discussion
<pdm-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pdm-devel-bounces@lists.proxmox.com
Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com>
Fixes:
warning: use of `or_insert` to construct default value
--> src/apt_repositories.rs:335:55
|
335 | let inner = info_map.entry(info.path.clone()).or_insert(HashMap::new());
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `or_default()`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unwrap_or_default
= note: `#[warn(clippy::unwrap_or_default)]` on by default
warning: use of `or_insert` to construct default value
--> src/apt_repositories.rs:336:45
|
336 | let entry = inner.entry(info.index).or_insert(Vec::new());
| ^^^^^^^^^^^^^^^^^^^^^ help: try: `or_default()`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unwrap_or_default
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
src/apt_repositories.rs | 4 ++--
src/configuration/network_edit.rs | 2 +-
src/configuration/network_view.rs | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/apt_repositories.rs b/src/apt_repositories.rs
index 2998a5a..7149545 100644
--- a/src/apt_repositories.rs
+++ b/src/apt_repositories.rs
@@ -329,8 +329,8 @@ fn apt_configuration_to_tree(config: &APTRepositoriesResult) -> SlabTree<TreeEnt
let mut info_map: HashMap<String, HashMap<usize, Vec<APTRepositoryInfo>>> = HashMap::new();
for info in &config.infos {
- let inner = info_map.entry(info.path.clone()).or_insert(HashMap::new());
- let entry = inner.entry(info.index).or_insert(Vec::new());
+ let inner = info_map.entry(info.path.clone()).or_default();
+ let entry = inner.entry(info.index).or_default();
entry.push(info.clone());
}
diff --git a/src/configuration/network_edit.rs b/src/configuration/network_edit.rs
index 010dc30..cf1bc60 100644
--- a/src/configuration/network_edit.rs
+++ b/src/configuration/network_edit.rs
@@ -184,7 +184,7 @@ fn render_bond_form(form_ctx: FormContext, props: &NetworkEdit) -> Html {
.get_field_value("bond_mode")
.map(|v| v.as_str().map(String::from))
.flatten()
- .unwrap_or(String::new());
+ .unwrap_or_default();
let allow_xmit_hash_policy = mode == "balance-xor" || mode == "802.3ad";
diff --git a/src/configuration/network_view.rs b/src/configuration/network_view.rs
index 4666b64..5dd0acf 100644
--- a/src/configuration/network_view.rs
+++ b/src/configuration/network_view.rs
@@ -333,12 +333,12 @@ fn format_ports_slaves(interface: &Interface) -> String {
.bridge_ports
.as_ref()
.map(|ports| ports.join(" "))
- .unwrap_or(String::new()),
+ .unwrap_or_default(),
NetworkInterfaceType::Bond => interface
.slaves
.as_ref()
.map(|ports| ports.join(" "))
- .unwrap_or(String::new()),
+ .unwrap_or_default(),
NetworkInterfaceType::Alias
| NetworkInterfaceType::Vlan
| NetworkInterfaceType::Eth
@@ -500,7 +500,7 @@ fn columns() -> Rc<Vec<DataTableHeader<Interface>>> {
DataTableColumn::new("Comment")
.flex(1)
.render(|item: &Interface| html!{
- item.comments.clone().unwrap_or(String::new())
+ item.comments.clone().unwrap_or_default()
})
.into()
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel