From 9b0da28632c2d5ffc42bf647213a8990fa0cbffb Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Thu, 27 Feb 2025 11:35:32 +0200 Subject: chore: Rust fmt --- zkvms/nexus/wrapper_macro/src/lib.rs | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'zkvms/nexus/wrapper_macro') diff --git a/zkvms/nexus/wrapper_macro/src/lib.rs b/zkvms/nexus/wrapper_macro/src/lib.rs index fd3a20d..324ace8 100644 --- a/zkvms/nexus/wrapper_macro/src/lib.rs +++ b/zkvms/nexus/wrapper_macro/src/lib.rs @@ -2,7 +2,7 @@ use proc_macro::TokenStream; #[path = "../../../../guests_macro/src/parse_fn.rs"] mod parse_fn; -use crate::parse_fn::{ split_fn, args_split, args_divide_public, args_divide_grouped }; +use crate::parse_fn::{args_divide_grouped, args_divide_public, args_split, split_fn}; /// Creates a body, which reads all inputs, stores them in variables, then /// writes the ones, defined as public in `default_public_input.toml` to the @@ -37,13 +37,21 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream { let (ts_patterns, ts_types) = args_divide_grouped(&args); let mut out = TokenStream::new(); - out.extend(format!("let {} = read_private_input::<{}>().unwrap();", ts_patterns, ts_types).parse::()); - - let public_inputs = toml::from_str::( - include_str!(concat!(env!("INPUTS_DIR"), "/default_public_input.toml")) + out.extend( + format!( + "let {} = read_private_input::<{}>().unwrap();", + ts_patterns, ts_types ) - .unwrap(); - let (public_patterns, public_types) = args_divide_public(&args, &public_inputs.keys().collect()).0; + .parse::(), + ); + + let public_inputs = toml::from_str::(include_str!(concat!( + env!("INPUTS_DIR"), + "/default_public_input.toml" + ))) + .unwrap(); + let (public_patterns, public_types) = + args_divide_public(&args, &public_inputs.keys().collect()).0; let public_patterns: Vec<(TokenStream, TokenStream)> = public_patterns .into_iter() .zip(public_types.into_iter()) @@ -52,7 +60,9 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream { out.extend(format!("write_output::<{}>(&{});", ptype, pattern).parse::()); } - out.extend(format!("write_output::<{}>(&zkp::{}{});", ret, name, ts_patterns).parse::()); + out.extend( + format!("write_output::<{}>(&zkp::{}{});", ret, name, ts_patterns).parse::(), + ); let mut block = TokenStream::new(); block.extend(format!("{{ {} }}", out).parse::()); -- cgit v1.2.3