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 A47051FF173
for <inbox@lore.proxmox.com>; Mon, 13 Jan 2025 15:28:20 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 60044F2D;
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:25 +0100
Message-Id: <20250113142725.523748-15-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 15/15] use and_then instead of
map(..).flatten(..) on Option
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: called `map(..).flatten()` on `Option`
--> src/configuration/network_view.rs:30:10
|
30 | .map(|c| c.as_str())
| __________^
31 | | .flatten()
| |__________________^ help: try replacing `map` with `and_then` and remove the `.flatten()`: `and_then(|c| c.as_str())`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#map_flatten
= note: `#[warn(clippy::map_flatten)]` on by default
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
src/configuration/network_edit.rs | 3 +--
src/configuration/network_view.rs | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/configuration/network_edit.rs b/src/configuration/network_edit.rs
index cf1bc60..84a9380 100644
--- a/src/configuration/network_edit.rs
+++ b/src/configuration/network_edit.rs
@@ -182,8 +182,7 @@ fn render_bond_form(form_ctx: FormContext, props: &NetworkEdit) -> Html {
let mode = form_ctx
.read()
.get_field_value("bond_mode")
- .map(|v| v.as_str().map(String::from))
- .flatten()
+ .and_then(|v| v.as_str().map(String::from))
.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 20ad5d0..cc2faae 100644
--- a/src/configuration/network_view.rs
+++ b/src/configuration/network_view.rs
@@ -27,8 +27,7 @@ async fn load_interfaces() -> Result<(Vec<Interface>, String), Error> {
let changes = resp
.attribs
.get("changes")
- .map(|c| c.as_str())
- .flatten()
+ .and_then(|c| c.as_str())
.unwrap_or("");
Ok((data, changes.to_string()))
}
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel