Skip to content

#[newtype_oparg] derive macro #7489

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

Closed
ShaharNaveh wants to merge 14 commits into from
Closed

#[newtype_oparg] derive macro #7489

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e599382
Basic struct support
ShaharNaveh Mar 19, 2026
b60f972
Base enum support
ShaharNaveh Mar 23, 2026
936a079
Modify code for new macro
ShaharNaveh Mar 23, 2026
94d66dd
No need for full feature
ShaharNaveh Mar 23, 2026
f5c2f9b
Remove debug code
ShaharNaveh Mar 23, 2026
9fbc6d3
Impl hash
ShaharNaveh Mar 23, 2026
49d2fb6
Merge remote-tracking branch 'upstream/main' into macro-newtype-oparg
ShaharNaveh Mar 24, 2026
f7b11b6
syn full feature
ShaharNaveh Mar 24, 2026
f21d855
Remove unwrap
ShaharNaveh Mar 24, 2026
77eae15
Use `TryFrom`
ShaharNaveh Mar 24, 2026
4d6c725
Convert `ConvertValueOparg` to new macro
ShaharNaveh Mar 24, 2026
c702fbe
Fix bug where `catch_all` is not the last element
ShaharNaveh Mar 24, 2026
796b61c
Don't match on 255
ShaharNaveh Mar 24, 2026
9691476
Validate `catch_all` variant drfinition
ShaharNaveh Mar 24, 2026
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
Prev Previous commit
Next Next commit
Use TryFrom
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Mar 24, 2026
commit 77eae154111f8174dcbb9b3ae79870f3304a7252
89 changes: 46 additions & 43 deletions crates/macros/src/newtype_oparg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,29 +93,10 @@ struct VariantInfo {
catch_all: bool,
}

pub(super) fn handle_enum(item: ItemEnum) -> syn::Result<proc_macro2::TokenStream> {
if !item.generics.params.is_empty() {
return Err(Error::new(
item.span(),
"A new type oparg cannot be generic.",
));
}

let ItemEnum {
attrs,
vis,
enum_token,
ident,
generics: _,
brace_token: _,
variants,
} = item.clone();

let mut variants_info = vec![];
for variant in &variants {
let ident = variant.ident.clone();
let discriminant = variant.discriminant.as_ref().map(|(_, expr)| expr.clone());
impl TryFrom<syn::Variant> for VariantInfo {
type Error = syn::Error;

fn try_from(variant: syn::Variant) -> Result<Self, Self::Error> {
let mut display = None;
let mut catch_all = false;
for attr in &variant.attrs {
Expand All @@ -137,13 +118,55 @@ pub(super) fn handle_enum(item: ItemEnum) -> syn::Result<proc_macro2::TokenStrea
})?
}

variants_info.push(VariantInfo {
let ident = variant.ident.clone();
let discriminant = variant.discriminant.as_ref().map(|(_, expr)| expr.clone());

if catch_all && display.is_some() {
return Err(Error::new(
ident.span(),
r#"Cannot define both `#[oparg(catch_all)`] and `#[oparg(display = "...")]` on the same variant"#,
));
}

if discriminant.is_none() && !catch_all {
return Err(Error::new(
ident.span(),
"Is a variant without an assigned value",
));
}

Ok(Self {
ident,
discriminant,
display,
catch_all,
})
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

pub(super) fn handle_enum(item: ItemEnum) -> syn::Result<proc_macro2::TokenStream> {
if !item.generics.params.is_empty() {
return Err(Error::new(
item.span(),
"A new type oparg cannot be generic.",
));
}

let ItemEnum {
attrs,
vis,
enum_token,
ident,
generics: _,
brace_token: _,
variants,
} = item.clone();

let mut variants_info = variants
.iter()
.cloned()
.map(VariantInfo::try_from)
.collect::<syn::Result<Vec<_>>>()?;

let catch_all = variants_info.pop_if(|info| info.catch_all);

Expand All @@ -155,26 +178,6 @@ pub(super) fn handle_enum(item: ItemEnum) -> syn::Result<proc_macro2::TokenStrea
));
};

match catch_all {
Some(vinfo) if vinfo.display.is_some() => {
return Err(Error::new(
vinfo.ident.span(),
r#"Cannot define both `#[oparg(catch_all)`] and `#[oparg(display = "...")]` on the same variant"#,
));
}
_ => {}
};

// Ensure all variants has a discriminant.
for vinfo in &variants_info {
if vinfo.discriminant.is_none() {
return Err(Error::new(
vinfo.ident.span(),
"Is a variant without an assigned value",
));
}
}

let variants_def = variants.iter().cloned().map(|mut variant| {
// Don't assign value. Enables more optimizations by the compiler.
variant.discriminant = None;
Expand Down
Loading