Skip to content

fix(stackable-versioned): Correctly emit enum fields in From impls #1086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 3, 2025
Merged

fix(stackable-versioned): Correctly emit enum fields in From impls #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb625b2
fix(stackable-versioned): Correctly emit enum fields in From impls
Techassi Sep 2, 2025
2b53a9d
chore(stackable-versioned): Add changelog entry
Techassi Sep 2, 2025
c4488c9
fix(stackable-versioned): Correctly emit empty named field variants
Techassi Sep 2, 2025
aba872e
fix: Bump tracing-subscriber to 0.3.20 to fix RUSTSEC-2025-0055
Techassi Sep 2, 2025
26b8232
fix(stackable-versioned): Use correct quote repetition
Techassi Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 16 additions & 60 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 61 additions & 40 deletions crates/stackable-versioned-macros/src/codegen/item/variant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ use darling::{FromVariant, Result, util::IdentString};
use k8s_version::Version;
use proc_macro2::{Span, TokenStream};
use quote::{format_ident, quote};
use syn::{Attribute, Fields, Type, TypeNever, Variant, token::Not};
use syn::{
Attribute, Fields, FieldsNamed, FieldsUnnamed, Ident, Type, TypeNever, Variant, token::Not,
};

use crate::{
attrs::item::VariantAttributes,
Expand Down Expand Up @@ -138,7 +140,8 @@ impl VersionedVariant {
next_version: &VersionDefinition,
enum_ident: &IdentString,
) -> Option<TokenStream> {
let variant_fields = self.fields_as_token_stream();
let from_fields = self.generate_from_fields();
let for_fields = self.generate_for_fields();

match &self.changes {
Some(changes) => {
Expand All @@ -154,16 +157,15 @@ impl VersionedVariant {
let next_variant_ident = next.get_ident();
let old_variant_ident = old.get_ident();

let old = quote! {
#old_version_ident::#enum_ident::#old_variant_ident #variant_fields
};
let next = quote! {
#next_version_ident::#enum_ident::#next_variant_ident #variant_fields
};

match direction {
Direction::Upgrade => Some(quote! { #old => #next, }),
Direction::Downgrade => Some(quote! { #next => #old, }),
Direction::Upgrade => Some(quote! {
#old_version_ident::#enum_ident::#old_variant_ident #from_fields
=> #next_version_ident::#enum_ident::#next_variant_ident #for_fields,
}),
Direction::Downgrade => Some(quote! {
#next_version_ident::#enum_ident::#next_variant_ident #from_fields
=> #old_version_ident::#enum_ident::#old_variant_ident #from_fields,
}),
}
}
}
Expand All @@ -173,48 +175,67 @@ impl VersionedVariant {
let old_version_ident = &version.idents.module;
let variant_ident = &*self.ident;

let old = quote! {
#old_version_ident::#enum_ident::#variant_ident #variant_fields
};
let next = quote! {
#next_version_ident::#enum_ident::#variant_ident #variant_fields
};

match direction {
Direction::Upgrade => Some(quote! { #old => #next, }),
Direction::Downgrade => Some(quote! { #next => #old, }),
Direction::Upgrade => Some(quote! {
#old_version_ident::#enum_ident::#variant_ident #from_fields
=> #next_version_ident::#enum_ident::#variant_ident #for_fields,
}),
Direction::Downgrade => Some(quote! {
#next_version_ident::#enum_ident::#variant_ident #from_fields
=> #old_version_ident::#enum_ident::#variant_ident #for_fields,
}),
}
}
}
}

fn fields_as_token_stream(&self) -> Option<TokenStream> {
fn generate_for_fields(&self) -> Option<TokenStream> {
match &self.fields {
Fields::Named(fields_named) => {
let fields: Vec<_> = fields_named
.named
.iter()
.map(|field| {
field
.ident
.as_ref()
.expect("named fields always have an ident")
})
.collect();
let fields = Self::named_field_idents(fields_named);
Some(quote! { { #(#fields: #fields.into(),)* } })
}
Fields::Unnamed(fields_unnamed) => {
let fields = Self::unnamed_field_ident(fields_unnamed);
Some(quote! { ( #(#fields.into())* ) })
}
Fields::Unit => None,
}
}

Some(quote! { { #(#fields),* } })
fn generate_from_fields(&self) -> Option<TokenStream> {
match &self.fields {
Fields::Named(fields_named) => {
let fields = Self::named_field_idents(fields_named);
Some(quote! { { #(#fields,)* } })
}
Fields::Unnamed(fields_unnamed) => {
let fields: Vec<_> = fields_unnamed
.unnamed
.iter()
.enumerate()
.map(|(index, _)| format_ident!("__sv_{index}"))
.collect();

Some(quote! { ( #(#fields),* ) })
let fields = Self::unnamed_field_ident(fields_unnamed);
Some(quote! { ( #(#fields)* ) })
}
Fields::Unit => None,
}
}

fn named_field_idents(fields_named: &FieldsNamed) -> Vec<&Ident> {
fields_named
.named
.iter()
.map(|field| {
field
.ident
.as_ref()
.expect("named fields always have an ident")
})
.collect()
}

fn unnamed_field_ident(fields_unnamed: &FieldsUnnamed) -> Vec<Ident> {
fields_unnamed
.unnamed
.iter()
.enumerate()
.map(|(index, _)| format_ident!("__sv_{index}"))
.collect()
}
}
19 changes: 19 additions & 0 deletions crates/stackable-versioned-macros/tests/inputs/pass/enum_fields.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
use stackable_versioned::versioned;
// ---
#[versioned(version(name = "v1alpha1"), version(name = "v1alpha2"))]
// ---
pub mod versioned {
enum Foo {
A { aa: usize, aaa: u64 },
B { bb: bool },
}

enum Bar {
A(A),
B {},
}

struct A {}
}
// ---
fn main() {}
Loading