Skip to content

Add compiler error when single value event used with multiple data entries #1794

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
mootz12 merged 2 commits into from
Mar 26, 2026
+12 −5
Merged

Add compiler error when single value event used with multiple data entries #1794

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694f455
chore: improve error when single type event used with multiple data e…
mootz12 Mar 26, 2026
3bcda86
Merge branch 'main' into harden-single-value-event
mootz12 Mar 26, 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
17 changes: 12 additions & 5 deletions soroban-sdk-macros/src/derive_event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ fn derive_impls(args: &ContractEventArgs, input: &DeriveInput) -> Result<TokenSt
.collect::<Vec<_>>();

// If errors have occurred, return them.
let errors = errors.checkpoint()?;
let mut errors = errors.checkpoint()?;

// Generated code spec.
let export = args.export.unwrap_or(true);
Expand Down Expand Up @@ -266,10 +266,17 @@ fn derive_impls(args: &ContractEventArgs, input: &DeriveInput) -> Result<TokenSt
DataFormat::SingleValue if data_params_count == 0 => quote! {
#path::Val::VOID.to_val()
},
DataFormat::SingleValue => quote! {
use #path::IntoVal;
#(self.#data_idents.into_val(env))*
},
DataFormat::SingleValue => {
if data_params_count > 1 {
errors.push(Error::custom(
"data_format = \"single-value\" requires exactly 0 or 1 data fields, but found more",
));
}
quote! {
use #path::IntoVal;
#(self.#data_idents.into_val(env))*
Comment thread
mootz12 marked this conversation as resolved.
}
}
DataFormat::Vec if data_params_count == 0 => quote! {
use #path::IntoVal;
#path::Vec::<#path::Val>::new(env).into_val(env)
Expand Down
Loading