Skip to content

Commit

Permalink
run cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
anaPerezGhiglia committed Aug 7, 2024
1 parent ac3aa22 commit 7914726
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
13 changes: 4 additions & 9 deletions tooling/debugger/src/dap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -670,15 +670,10 @@ pub fn run_session<R: Read, W: Write, B: BlackBoxFunctionSolver<FieldElement>>(
initial_witness: WitnessMap<FieldElement>,
test_function: Option<TestFunction>,
) -> Result<(), ServerError> {
let debug_artifact = DebugArtifact { debug_symbols: program.debug.clone(), file_map: program.file_map.clone() };
let mut session = DapSession::new(
server,
solver,
&program,
&debug_artifact,
initial_witness,
test_function,
);
let debug_artifact =
DebugArtifact { debug_symbols: program.debug.clone(), file_map: program.file_map.clone() };
let mut session =
DapSession::new(server, solver, &program, &debug_artifact, initial_witness, test_function);

session.run_loop()
}
8 changes: 2 additions & 6 deletions tooling/nargo_cli/src/cli/dap_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,8 @@ fn load_and_compile_test_function(
let (mut context, crate_id) =
prepare_package_for_debug(&workspace_file_manager, &mut parsed_files, package);

check_crate(
&mut context,
crate_id,
compile_options,
)
.expect("Any errors should have occurred when collecting test functions");
check_crate(&mut context, crate_id, compile_options)
.expect("Any errors should have occurred when collecting test functions");

let test_functions = context
.get_all_test_functions_in_crate_matching(&crate_id, FunctionNameMatch::Exact(test_name));
Expand Down
3 changes: 2 additions & 1 deletion tooling/nargo_cli/src/cli/debug_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ fn run_async(
}

type DebugResult = Result<WitnessStack<FieldElement>, NargoError<FieldElement>>;
type ExecutionResult = Result<(Option<InputValue>, WitnessStack<FieldElement>), NargoError<FieldElement>>;
type ExecutionResult =
Result<(Option<InputValue>, WitnessStack<FieldElement>), NargoError<FieldElement>>;

// FIXME: We have nested results to differentiate between the execution result (the inner one - Nargo)
// and setting up the debugger errors (outer one - CliErrors)
Expand Down

0 comments on commit 7914726

Please sign in to comment.