[pdm-devel] [PATCH proxmox v2] pve-api-types: schema2rust: handle `macro` keyword like we do `type`

[pdm-devel] [PATCH proxmox v2] pve-api-types: schema2rust: handle `macro` keyword like we do `type`

[Hannes Laimer]

Firewall rules have a field named `macro`, this would trip up the
generated rust code. This fixes that.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
v2:
- include quoting of `macro`, this was missing in v1 but is needed

 pve-api-types/generator-lib/Schema2Rust.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pve-api-types/generator-lib/Schema2Rust.pm b/pve-api-types/generator-lib/Schema2Rust.pm
index c5ac4aad..9b984abb 100644
--- a/pve-api-types/generator-lib/Schema2Rust.pm
+++ b/pve-api-types/generator-lib/Schema2Rust.pm
@@ -125,8 +125,8 @@ sub api_to_string : prototype($$$$$) {
 
         local $API_TYPE_POS = "$API_TYPE_POS/$key";
 
-        # We need to quote keys with hyphens:
-        my $safe_key = ($key =~ /-/) ? "\"$key\"" : $key;
+        # We need to quote keys with hyphens or reserved keywords:
+        my $safe_key = (($key =~ /-/) || ($key eq 'macro')) ? "\"$key\"" : $key;
 
         if (exists($API_TYPE_OVERRIDES{$API_TYPE_POS})) {
             $value = $API_TYPE_OVERRIDES{$API_TYPE_POS};
@@ -171,7 +171,7 @@ sub api_to_string : prototype($$$$$) {
                 warn "api type extension for $API_TYPE_POS.$key already in schema, skipping\n";
                 next;
             }
-            my $safe_key = ($key =~ /-/) ? "\"$key\"" : $key;
+            my $safe_key = (($key =~ /-/) || ($key eq 'macro')) ? "\"$key\"" : $key;
             my $value = $extra->{$key};
             print {$out} "${indent}$safe_key: $value,\n";
         }
@@ -713,6 +713,7 @@ sub namify_field : prototype($) {
     }
 
     return 'ty' if $out eq 'type';
+    return 'r#macro' if $out eq 'macro';
 
     return $out;
 }
-- 
2.47.3



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel

[pdm-devel] applied: [PATCH proxmox v2] pve-api-types: schema2rust: handle `macro` keyword like we do `type`

[Wolfgang Bumiller]

applied, thanks

On Thu, Oct 23, 2025 at 04:19:56PM +0200, Hannes Laimer wrote:
> Firewall rules have a field named `macro`, this would trip up the
> generated rust code. This fixes that.
> 
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
> v2:
> - include quoting of `macro`, this was missing in v1 but is needed
> 
>  pve-api-types/generator-lib/Schema2Rust.pm | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/pve-api-types/generator-lib/Schema2Rust.pm b/pve-api-types/generator-lib/Schema2Rust.pm
> index c5ac4aad..9b984abb 100644
> --- a/pve-api-types/generator-lib/Schema2Rust.pm
> +++ b/pve-api-types/generator-lib/Schema2Rust.pm
> @@ -125,8 +125,8 @@ sub api_to_string : prototype($$$$$) {
>  
>          local $API_TYPE_POS = "$API_TYPE_POS/$key";
>  
> -        # We need to quote keys with hyphens:
> -        my $safe_key = ($key =~ /-/) ? "\"$key\"" : $key;
> +        # We need to quote keys with hyphens or reserved keywords:
> +        my $safe_key = (($key =~ /-/) || ($key eq 'macro')) ? "\"$key\"" : $key;
>  
>          if (exists($API_TYPE_OVERRIDES{$API_TYPE_POS})) {
>              $value = $API_TYPE_OVERRIDES{$API_TYPE_POS};
> @@ -171,7 +171,7 @@ sub api_to_string : prototype($$$$$) {
>                  warn "api type extension for $API_TYPE_POS.$key already in schema, skipping\n";
>                  next;
>              }
> -            my $safe_key = ($key =~ /-/) ? "\"$key\"" : $key;
> +            my $safe_key = (($key =~ /-/) || ($key eq 'macro')) ? "\"$key\"" : $key;
>              my $value = $extra->{$key};
>              print {$out} "${indent}$safe_key: $value,\n";
>          }
> @@ -713,6 +713,7 @@ sub namify_field : prototype($) {
>      }
>  
>      return 'ty' if $out eq 'type';
> +    return 'r#macro' if $out eq 'macro';
>  
>      return $out;
>  }
> -- 
> 2.47.3


_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel