diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-04-07 17:40:13 +0300 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-04-07 17:41:20 +0300 |
| commit | 1f3ca1f4455c4dd98680ede689bbcfba2c8e4225 (patch) | |
| tree | 4a16c194078443232f3503e6a99e076abf339c4c | |
| parent | 2fcec28f664c9e7d995711a2d02d7c069ba9eecd (diff) | |
| download | zkVMs-benchmarks-1f3ca1f4455c4dd98680ede689bbcfba2c8e4225.tar zkVMs-benchmarks-1f3ca1f4455c4dd98680ede689bbcfba2c8e4225.tar.gz zkVMs-benchmarks-1f3ca1f4455c4dd98680ede689bbcfba2c8e4225.zip | |
fix(zkvms): Fix non-braced usages of grouped methods
Before grouping transformed vec![a,b,...] into "(a,b,...)", but with
FunctionDefinition, grouping transforms vec![a,b,...] into "a,b,...".
This change wasn't reflected in Nexus and ZKM
| -rw-r--r-- | zkvms/nexus/wrapper_macro/src/lib.rs | 4 | ||||
| -rw-r--r-- | zkvms/zkm/wrapper_macro/src/lib.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/zkvms/nexus/wrapper_macro/src/lib.rs b/zkvms/nexus/wrapper_macro/src/lib.rs index 218359b..69d1de2 100644 --- a/zkvms/nexus/wrapper_macro/src/lib.rs +++ b/zkvms/nexus/wrapper_macro/src/lib.rs @@ -35,8 +35,8 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream { let fd = FunctionDefinition::new(&item); let mut out = TokenStream::new(); - out.extend(format!("let {} = read_public_input::<{}>().unwrap();", fd.grouped_public_patterns(), fd.grouped_public_types()).parse::<TokenStream>()); - out.extend(format!("let {} = read_private_input::<{}>().unwrap();", fd.grouped_private_patterns(), fd.grouped_private_types()).parse::<TokenStream>()); + out.extend(format!("let ({}) = read_public_input::<({})>().unwrap();", fd.grouped_public_patterns(), fd.grouped_public_types()).parse::<TokenStream>()); + out.extend(format!("let ({}) = read_private_input::<({})>().unwrap();", fd.grouped_private_patterns(), fd.grouped_private_types()).parse::<TokenStream>()); out.extend( format!( diff --git a/zkvms/zkm/wrapper_macro/src/lib.rs b/zkvms/zkm/wrapper_macro/src/lib.rs index 4e00cc5..6a88602 100644 --- a/zkvms/zkm/wrapper_macro/src/lib.rs +++ b/zkvms/zkm/wrapper_macro/src/lib.rs @@ -33,8 +33,8 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream { let mut out = TokenStream::new(); // NOTE: The first read returns public data, the second returns private - out.extend(format!("let {} : {} = read();", fd.grouped_public_patterns(), fd.grouped_public_types()).parse::<TokenStream>()); - out.extend(format!("let {} : {} = read();", fd.grouped_private_patterns(), fd.grouped_private_types()).parse::<TokenStream>()); + out.extend(format!("let ({}) : ({}) = read();", fd.grouped_public_patterns(), fd.grouped_public_types()).parse::<TokenStream>()); + out.extend(format!("let ({}) : ({}) = read();", fd.grouped_private_patterns(), fd.grouped_private_types()).parse::<TokenStream>()); out.extend(format!("commit::<{}>(&zkp::{}({}));", fd.return_type, fd.name, fd.grouped_patterns()).parse::<TokenStream>()); |