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 ADABDB3A1A for ; Wed, 29 Nov 2023 13:50:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 85F796CE5 for ; Wed, 29 Nov 2023 13:50:02 +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 ; Wed, 29 Nov 2023 13:50:01 +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 4909540A70 for ; Wed, 29 Nov 2023 13:50:01 +0100 (CET) Message-ID: <860129ad-64b5-44b2-bb05-bf6f6fa3272a@proxmox.com> Date: Wed, 29 Nov 2023 13:50:00 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Wolfgang Bumiller Cc: pbs-devel@lists.proxmox.com References: <20231129090746.38798-1-g.goller@proxmox.com> <20231129090746.38798-5-g.goller@proxmox.com> From: Gabriel Goller In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.186 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 - Subject: Re: [pbs-devel] [PATCH v4 proxmox-backup 4/5] node: status: declutter kernel-version 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: Wed, 29 Nov 2023 12:50:02 -0000 On 11/29/23 11:23, Wolfgang Bumiller wrote: > On Wed, Nov 29, 2023 at 10:07:45AM +0100, Gabriel Goller wrote: >> >> +#[api] >> +#[derive(Serialize, Deserialize, Default)] >> +#[serde(rename_all = "lowercase")] >> +/// The current kernel version (output of `uname`) >> +pub struct KernelVersionInformation { >> + /// The systemname/nodename >> + pub sysname: String, >> + /// The kernel release number >> + pub release: String, >> + /// The kernel version >> + pub version: String, >> + /// The machine architecture >> + pub machine: String, >> +} >> + >> +impl KernelVersionInformation { >> + pub fn from_ostr(sysname: &OsStr, release: &OsStr, version: &OsStr, machine: &OsStr) -> Self { > from_ostr is a bit of a weird name for a public method taking 4 > parameters. > > consider a `From<&UtsName>` implementation. Hmm I was under the impression that we don't want to pull in any more crates into `pbs-api-types`... Another option I had was implement From<[&OsStr; 4] on KernelVersionInformation? >> + KernelVersionInformation { >> + sysname: sysname >> + .to_os_string() >> + .into_string() >> + .unwrap_or("".to_string()), > .unwrap_or_default(), also, whenver you think "".to_string(), type > String::new() instead ;-) > > also, you first convert to an owned string - this always works, and then > do the fallible `into_string()`, so even if it's not a valid string you > clone and discard, instead, do: > sysname > .to_str() > .map(String::from) > .unwrap_or_default() > > this way there's no string copying if it's not valid utf-8 becausee that > is checked first > > same for the cases below Ohh, thanks for the heads up!