chore: remove unwanted changes from merge

crates/nargo/src/ops/execute.rs

@@ -1,6 +1,7 @@
-use acvm::pwg::PartialWitnessGeneratorStatus;
+use acvm::acir::native_types::WitnessMap;
+use acvm::pwg::{solve, PartialWitnessGeneratorStatus};
 use acvm::PartialWitnessGenerator;
-use acvm::{acir::circuit::Circuit, acir::native_types::WitnessMap, pwg::block::Blocks};
+use acvm::{acir::circuit::Circuit, pwg::block::Blocks};
 
 use crate::NargoError;
 
@@ -10,8 +11,7 @@ pub fn execute_circuit(
     mut initial_witness: WitnessMap,
 ) -> Result<WitnessMap, NargoError> {
     let mut blocks = Blocks::default();
-    let solver_status =
-        acvm::pwg::solve(backend, &mut initial_witness, &mut blocks, circuit.opcodes)?;
+    let solver_status = solve(backend, &mut initial_witness, &mut blocks, circuit.opcodes)?;
     if matches!(solver_status, PartialWitnessGeneratorStatus::RequiresOracleData { .. }) {
         todo!("Add oracle support to nargo execute")
     }

crates/nargo_cli/src/cli/test_cmd.rs

@@ -21,10 +21,11 @@ pub(crate) struct TestCommand {
     compile_options: CompileOptions,
 }
 
-pub(crate) fn run<B>(backend: &B, args: TestCommand, config: NargoConfig) -> Result<(), CliError<B>>
-where
-    B: Backend,
-{
+pub(crate) fn run<B: Backend>(
+    backend: &B,
+    args: TestCommand,
+    config: NargoConfig,
+) -> Result<(), CliError<B>> {
     let test_name: String = args.test_name.unwrap_or_else(|| "".to_owned());
 
     run_tests(backend, &config.program_dir, &test_name, &args.compile_options)

crates/noirc_evaluator/src/ssa/acir_gen/operations/sort.rs

@@ -115,7 +115,7 @@ fn permutation_layer(
 mod test {
     use acvm::{
         acir::{ative_types::WitnessMap, circuit::opcodes::FunctionInput, native_types::Witness},
-        pwg::block::Blocks,
+        pwg::{block::Blocks, solve, PartialWitnessGeneratorStatus},
         FieldElement, OpcodeResolution, OpcodeResolutionError, PartialWitnessGenerator,
     };