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 D1A37FDEA for ; Tue, 25 Jul 2023 10:36:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B4DB8175CD for ; Tue, 25 Jul 2023 10:35:53 +0200 (CEST) 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, 25 Jul 2023 10:35:53 +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 F2C7C43FA3 for ; Tue, 25 Jul 2023 10:35:52 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 25 Jul 2023 10:35:40 +0200 Message-ID: <20230725083544.212737-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725083544.212737-1-c.heiss@proxmox.com> References: <20230725083544.212737-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.051 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. [bootdisk.rs] Subject: [pve-devel] [PATCH installer 1/3] tui: bootdisk: refactor Rc> type into custom type X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2023 08:36:23 -0000 Will be used/passed around quite a lot of times due to future changes, so simplify it a bit. No functional changes. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/views/bootdisk.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/proxmox-tui-installer/src/views/bootdisk.rs b/proxmox-tui-installer/src/views/bootdisk.rs index 6ef814f..d0f5abf 100644 --- a/proxmox-tui-installer/src/views/bootdisk.rs +++ b/proxmox-tui-installer/src/views/bootdisk.rs @@ -16,9 +16,13 @@ use crate::options::{ }; use crate::setup::ProxmoxProduct; +/// Convience wrapper when needing to take a (interior-mutable) reference to `BootdiskOptions`. +/// Interior mutability is safe for this case, as it is completely single-threaded. +pub type BootdiskOptionsRef = Rc>; + pub struct BootdiskOptionsView { view: LinearLayout, - advanced_options: Rc>, + advanced_options: BootdiskOptionsRef, } impl BootdiskOptionsView { @@ -519,14 +523,14 @@ impl ViewWrapper for ZfsBootdiskOptionsView { cursive::wrap_impl!(self.view: MultiDiskOptionsView); } -fn advanced_options_view(disks: &[Disk], options: Rc>) -> impl View { +fn advanced_options_view(disks: &[Disk], options_ref: BootdiskOptionsRef) -> impl View { Dialog::around(AdvancedBootdiskOptionsView::new( disks, - &(*options).borrow(), + &(*options_ref).borrow(), )) .title("Advanced bootdisk options") .button("Ok", { - let options_ref = options.clone(); + let options_ref = options_ref.clone(); move |siv| { let options = siv .call_on_name("advanced-bootdisk-options-dialog", |view: &mut Dialog| { @@ -555,7 +559,7 @@ fn advanced_options_view(disks: &[Disk], options: Rc>) siv.pop_layer(); if let Some(options) = options { - *(*options_ref).borrow_mut() = options; + *options_ref.borrow_mut() = options; } } }) -- 2.41.0