From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id EB4351FF16F for ; Tue, 13 May 2025 12:15:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0DC401E602; Tue, 13 May 2025 12:15:33 +0200 (CEST) From: Stefan Hanreich To: pbs-devel@lists.proxmox.com Date: Tue, 13 May 2025 12:14:57 +0200 Message-Id: <20250513101459.122641-5-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250513101459.122641-1-s.hanreich@proxmox.com> References: <20250513101459.122641-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.233 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [schema2rust.pm] Subject: [pbs-devel] [PATCH proxmox-api-types 1/2] generator: use proxmox_serde for perl helpers 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" The helpers for parsing perl values have been moved to proxmox_serde, update all references to proxmox_login. No functional changes. Signed-off-by: Stefan Hanreich --- Cargo.toml | 2 +- pve-api-types/Cargo.toml | 2 +- pve-api-types/generator-lib/Schema2Rust.pm | 26 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1bbdd01..1e119d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ serde_plain = "1" serde_json = "1" proxmox-api-macro = "1.3" -proxmox-login = "0.2" +proxmox-serde = "0.1.2" proxmox-schema = "4" proxmox-client = "0.5" diff --git a/pve-api-types/Cargo.toml b/pve-api-types/Cargo.toml index 73cd3ef..e388cac 100644 --- a/pve-api-types/Cargo.toml +++ b/pve-api-types/Cargo.toml @@ -18,7 +18,7 @@ serde_json.workspace = true serde_plain.workspace = true # proxmox-api-macro.workspace = true -proxmox-login.workspace = true +proxmox-serde = { workspace = true, features = [ "perl" ] } proxmox-schema = { workspace = true, features = [ "api-types", "api-macro" ] } # For the client feature: diff --git a/pve-api-types/generator-lib/Schema2Rust.pm b/pve-api-types/generator-lib/Schema2Rust.pm index 009cf13..99a8fd6 100644 --- a/pve-api-types/generator-lib/Schema2Rust.pm +++ b/pve-api-types/generator-lib/Schema2Rust.pm @@ -1127,18 +1127,18 @@ my sub array_type : prototype($$$) { } my %serde_num = ( - usize => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_usize")]', - isize => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_isize")]', - u8 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_u8")]', - u16 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_u16")]', - u32 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_u32")]', - u64 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_u64")]', - i8 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_i8")]', - i16 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_i16")]', - i32 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_i32")]', - i64 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_i64")]', - f32 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_f32")]', - f64 => '#[serde(deserialize_with = "proxmox_login::parse::deserialize_f64")]', + usize => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_usize")]', + isize => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_isize")]', + u8 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_u8")]', + u16 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_u16")]', + u32 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_u32")]', + u64 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_u64")]', + i8 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_i8")]', + i16 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_i16")]', + i32 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_i32")]', + i64 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_i64")]', + f32 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_f32")]', + f64 => '#[serde(deserialize_with = "proxmox_serde::perl::deserialize_f64")]', ); sub handle_def : prototype($$$) { @@ -1169,7 +1169,7 @@ sub handle_def : prototype($$$) { } elsif ($type eq 'boolean') { $def->{type} = 'bool'; push $def->{attrs}->@*, - "#[serde(deserialize_with = \"proxmox_login::parse::deserialize_bool\")]"; + "#[serde(deserialize_with = \"proxmox_serde::perl::deserialize_bool\")]"; $def->{api}->{default} = bool(delete $schema->{default}); } elsif ($type eq 'number') { $def->{api}->{default} = delete $schema->{default}; -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel