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 08CFA9D055 for ; Wed, 25 Oct 2023 10:56:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC9D111EF3 for ; Wed, 25 Oct 2023 10:56:42 +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 ; Wed, 25 Oct 2023 10:56:42 +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 E1706450E6 for ; Wed, 25 Oct 2023 10:56:41 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 25 Oct 2023 10:56:24 +0200 Message-ID: <20231025085634.171618-4-c.heiss@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231025085634.171618-1-c.heiss@proxmox.com> References: <20231025085634.171618-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.021 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_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs] Subject: [pve-devel] [PATCH installer v2 3/3] tui: remove obsolete, global `SetupInfo` state 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: Wed, 25 Oct 2023 08:56:43 -0000 Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/main.rs | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs index a342a08..81fe3ca 100644 --- a/proxmox-tui-installer/src/main.rs +++ b/proxmox-tui-installer/src/main.rs @@ -1,3 +1,5 @@ +#![forbid(unsafe_code)] + use std::{ collections::HashMap, env, @@ -50,24 +52,6 @@ const PROXMOX_LOGO: &str = r#" | __/| | | (_) > <| | | | | | (_) > < |_| |_| \___/_/\_\_| |_| |_|\___/_/\_\ "#; -/// ISO information is available globally. -static mut SETUP_INFO: Option = None; - -pub fn setup_info() -> &'static SetupInfo { - unsafe { SETUP_INFO.as_ref().unwrap() } -} - -fn init_setup_info(info: SetupInfo) { - unsafe { - SETUP_INFO = Some(info); - } -} - -#[inline] -pub fn current_product() -> setup::ProxmoxProduct { - setup_info().config.product -} - struct InstallerView { view: ResizedView, } @@ -223,7 +207,6 @@ fn installer_setup(in_test_mode: bool) -> Result<(SetupInfo, LocaleInfo, Runtime setup::read_json(&path).map_err(|err| format!("Failed to retrieve setup info: {err}"))? }; - init_setup_info(installer_info.clone()); let locale_info = { let mut path = path.clone(); -- 2.42.0