From 6724d2abe958de3e450fbbf201fa0683ee2997bc Mon Sep 17 00:00:00 2001 From: collin <16715212+collinc97@users.noreply.github.com> Date: Mon, 25 Jul 2022 14:17:36 -0700 Subject: [PATCH 1/3] remove unused code 1 --- Cargo.lock | 1 - compiler/core/Cargo.toml | 5 +-- compiler/core/src/account/mod.rs | 35 ------------------- compiler/core/src/algorithms/mod.rs | 13 ------- compiler/core/src/lib.rs | 10 ------ .../passes/src/type_checking/check_program.rs | 1 - .../src/type_checking/check_statements.rs | 5 --- compiler/passes/src/type_checking/checker.rs | 15 -------- compiler/span/src/symbol.rs | 7 ---- 9 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 compiler/core/src/account/mod.rs diff --git a/Cargo.lock b/Cargo.lock index c838e40bbd..6ab82ad6dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,7 +1182,6 @@ dependencies = [ name = "leo-core" version = "1.5.3" dependencies = [ - "indexmap", "leo-ast", "leo-errors", "leo-span", diff --git a/compiler/core/Cargo.toml b/compiler/core/Cargo.toml index b375bfdbaa..c772de01ed 100644 --- a/compiler/core/Cargo.toml +++ b/compiler/core/Cargo.toml @@ -30,7 +30,4 @@ version = "1.5.3" [dependencies.leo-span] path = "../span" -version = "1.5.3" - -[dependencies.indexmap] -version = "1.9" \ No newline at end of file +version = "1.5.3" \ No newline at end of file diff --git a/compiler/core/src/account/mod.rs b/compiler/core/src/account/mod.rs deleted file mode 100644 index aab4e33f74..0000000000 --- a/compiler/core/src/account/mod.rs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2019-2022 Aleo Systems Inc. -// This file is part of the Leo library. - -// The Leo library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// The Leo library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with the Leo library. If not, see . - -use crate::Types; - -use indexmap::IndexSet; - -use leo_span::Symbol; - -pub struct Account; - -impl Types for Account { - fn types() -> IndexSet { - IndexSet::from([ - Symbol::intern("ComputeKey"), - Symbol::intern("PrivateKey"), - Symbol::intern("Record"), - Symbol::intern("Signature"), - Symbol::intern("ViewKey"), - ]) - } -} diff --git a/compiler/core/src/algorithms/mod.rs b/compiler/core/src/algorithms/mod.rs index 907221a5ba..df90eaef94 100644 --- a/compiler/core/src/algorithms/mod.rs +++ b/compiler/core/src/algorithms/mod.rs @@ -22,13 +22,9 @@ pub use pedersen::*; mod poseidon; pub use poseidon::*; -use crate::Types; - use leo_ast::Type; use leo_span::{sym, Symbol}; -use indexmap::IndexSet; - /// A core instruction that maps directly to an AVM bytecode instruction. #[derive(Clone, PartialEq, Eq)] pub enum CoreInstruction { @@ -233,12 +229,3 @@ const BOOL_INT64_STRING_TYPES: [Type; 10] = [ Type::U64, Type::String, ]; - -// todo (collin): deprecate this code -pub struct Algorithms; - -impl Types for Algorithms { - fn types() -> IndexSet { - IndexSet::from([Symbol::intern("Poseidon")]) - } -} diff --git a/compiler/core/src/lib.rs b/compiler/core/src/lib.rs index 7ec8f5c1ce..2200c359f7 100644 --- a/compiler/core/src/lib.rs +++ b/compiler/core/src/lib.rs @@ -16,15 +16,5 @@ #![doc = include_str!("../README.md")] -use indexmap::IndexSet; -use leo_span::Symbol; - -mod account; -pub use account::*; - mod algorithms; pub use algorithms::*; - -pub trait Types { - fn types() -> IndexSet; -} diff --git a/compiler/passes/src/type_checking/check_program.rs b/compiler/passes/src/type_checking/check_program.rs index f5dc1cce8d..8bfd433ad9 100644 --- a/compiler/passes/src/type_checking/check_program.rs +++ b/compiler/passes/src/type_checking/check_program.rs @@ -35,7 +35,6 @@ impl<'a> ProgramVisitor<'a> for TypeChecker<'a> { self.parent = Some(input.name()); input.input.iter().for_each(|i| { let input_var = i.get_variable(); - self.check_core_type_conflict(&Some(input_var.type_.clone())); self.assert_not_tuple(input_var.span, &input_var.type_); // Check for conflicting variable names. diff --git a/compiler/passes/src/type_checking/check_statements.rs b/compiler/passes/src/type_checking/check_statements.rs index 55b6b86e7c..e66950f4d9 100644 --- a/compiler/passes/src/type_checking/check_statements.rs +++ b/compiler/passes/src/type_checking/check_statements.rs @@ -31,7 +31,6 @@ impl<'a> StatementVisitor<'a> for TypeChecker<'a> { .borrow() .lookup_fn_symbol(parent) .map(|f| f.output.clone()); - self.check_core_type_conflict(return_type); self.has_return = true; @@ -45,8 +44,6 @@ impl<'a> StatementVisitor<'a> for TypeChecker<'a> { VariableType::Mut }; - self.check_core_type_conflict(&Some(input.type_.clone())); - self.visit_expression(&input.value, &Some(input.type_.clone())); if let Err(err) = self.symbol_table.borrow_mut().insert_variable( @@ -87,7 +84,6 @@ impl<'a> StatementVisitor<'a> for TypeChecker<'a> { }; if var_type.is_some() { - self.check_core_type_conflict(&var_type); self.visit_expression(&input.value, &var_type); } } @@ -103,7 +99,6 @@ impl<'a> StatementVisitor<'a> for TypeChecker<'a> { fn visit_iteration(&mut self, input: &'a IterationStatement) { let iter_type = &Some(input.type_.clone()); self.assert_int_type(iter_type, input.variable.span); - self.check_core_type_conflict(iter_type); // Create a new scope for the loop body. let scope_index = self.symbol_table.borrow_mut().insert_block(); diff --git a/compiler/passes/src/type_checking/checker.rs b/compiler/passes/src/type_checking/checker.rs index d9e4dad7b1..9e87fea798 100644 --- a/compiler/passes/src/type_checking/checker.rs +++ b/compiler/passes/src/type_checking/checker.rs @@ -21,7 +21,6 @@ use leo_core::*; use leo_errors::{emitter::Handler, TypeCheckerError}; use leo_span::{Span, Symbol}; -use indexmap::IndexSet; use itertools::Itertools; use std::cell::RefCell; @@ -31,8 +30,6 @@ pub struct TypeChecker<'a> { pub(crate) parent: Option, pub(crate) has_return: bool, pub(crate) negate: bool, - pub(crate) account_types: IndexSet, - pub(crate) algorithms_types: IndexSet, } const BOOLEAN_TYPE: Type = Type::Boolean; @@ -69,8 +66,6 @@ impl<'a> TypeChecker<'a> { parent: None, has_return: false, negate: false, - account_types: Account::types(), - algorithms_types: Algorithms::types(), } } @@ -310,16 +305,6 @@ impl<'a> TypeChecker<'a> { Type::Identifier(circuit) } - /// Emits an error if the given type conflicts with a core library type. - pub(crate) fn check_core_type_conflict(&self, type_: &Option) { - // todo: deprecate this method. - if let Some(Type::Identifier(ident)) = type_ { - if self.account_types.contains(&ident.name) || self.algorithms_types.contains(&ident.name) { - self.emit_err(TypeCheckerError::core_type_name_conflict(&ident.name, ident.span())); - } - } - } - /// Emits an error if the type is a tuple. pub(crate) fn assert_not_tuple(&self, span: Span, type_: &Type) { if matches!(type_, Type::Tuple(_)) { diff --git a/compiler/span/src/symbol.rs b/compiler/span/src/symbol.rs index 62c70384a9..d20a3ad7cf 100644 --- a/compiler/span/src/symbol.rs +++ b/compiler/span/src/symbol.rs @@ -215,13 +215,6 @@ symbols! { owner, gates, - // todo: remove these. - CONTAINER_PSEUDO_CIRCUIT: "$InputContainer", - REGISTERS_PSEUDO_CIRCUIT: "$InputRegister", - RECORD_PSEUDO_CIRCUIT: "$InputRecord", - STATE_PSEUDO_CIRCUIT: "$InputState", - STATE_LEAF_PSEUDO_CIRCUIT: "$InputStateLeaf", - // input file registers, state, From 77a16585fe23dea8035b5a0bf05930160274d9f0 Mon Sep 17 00:00:00 2001 From: collin <16715212+collinc97@users.noreply.github.com> Date: Mon, 25 Jul 2022 18:48:16 -0700 Subject: [PATCH 2/3] remove unused tests --- tests/compiler/core/account/compute_key.leo | 9 --------- tests/compiler/core/account/private_key.leo | 9 --------- tests/compiler/core/account/record.leo | 9 --------- tests/compiler/core/account/signature.leo | 9 --------- tests/compiler/core/account/view_key.leo | 9 --------- .../compiler/compiler/core/account/compute_key.out | 5 ----- .../compiler/compiler/core/account/private_key.out | 5 ----- .../compiler/compiler/core/account/record.out | 5 ----- .../compiler/compiler/core/account/signature.out | 5 ----- .../compiler/compiler/core/account/view_key.out | 5 ----- 10 files changed, 70 deletions(-) delete mode 100644 tests/compiler/core/account/compute_key.leo delete mode 100644 tests/compiler/core/account/private_key.leo delete mode 100644 tests/compiler/core/account/record.leo delete mode 100644 tests/compiler/core/account/signature.leo delete mode 100644 tests/compiler/core/account/view_key.leo delete mode 100644 tests/expectations/compiler/compiler/core/account/compute_key.out delete mode 100644 tests/expectations/compiler/compiler/core/account/private_key.out delete mode 100644 tests/expectations/compiler/compiler/core/account/record.out delete mode 100644 tests/expectations/compiler/compiler/core/account/signature.out delete mode 100644 tests/expectations/compiler/compiler/core/account/view_key.out diff --git a/tests/compiler/core/account/compute_key.leo b/tests/compiler/core/account/compute_key.leo deleted file mode 100644 index cb9593d908..0000000000 --- a/tests/compiler/core/account/compute_key.leo +++ /dev/null @@ -1,9 +0,0 @@ -/* -namespace: Compile -expectation: Fail -*/ - -// todo: rewrite this test so it properly tests a compute key. -function main(public compute_key: ComputeKey, a: bool) -> bool { - return a; -} diff --git a/tests/compiler/core/account/private_key.leo b/tests/compiler/core/account/private_key.leo deleted file mode 100644 index 4ba61bdfdb..0000000000 --- a/tests/compiler/core/account/private_key.leo +++ /dev/null @@ -1,9 +0,0 @@ -/* -namespace: Compile -expectation: Fail -*/ - -// todo: rewrite this test so it properly tests a private key. -function main(public private_key: PrivateKey, a: bool) -> bool { - return a; -} diff --git a/tests/compiler/core/account/record.leo b/tests/compiler/core/account/record.leo deleted file mode 100644 index 833c61127b..0000000000 --- a/tests/compiler/core/account/record.leo +++ /dev/null @@ -1,9 +0,0 @@ -/* -namespace: Compile -expectation: Fail -*/ - -// todo: rewrite this test so it properly tests a record type. -function main(public record: Record, a: bool) -> bool { - return a; -} diff --git a/tests/compiler/core/account/signature.leo b/tests/compiler/core/account/signature.leo deleted file mode 100644 index 2b8c578ed1..0000000000 --- a/tests/compiler/core/account/signature.leo +++ /dev/null @@ -1,9 +0,0 @@ -/* -namespace: Compile -expectation: Fail -*/ - -// todo: rewrite this test so it properly tests a signature. -function main(public signature: Signature, a: bool) -> bool { - return a; -} diff --git a/tests/compiler/core/account/view_key.leo b/tests/compiler/core/account/view_key.leo deleted file mode 100644 index ce62b86a83..0000000000 --- a/tests/compiler/core/account/view_key.leo +++ /dev/null @@ -1,9 +0,0 @@ -/* -namespace: Compile -expectation: Fail -*/ - -// todo: rewrite this test so it properly tests a view key. -function main(public view_key: ViewKey, a: bool) -> bool { - return a; -} diff --git a/tests/expectations/compiler/compiler/core/account/compute_key.out b/tests/expectations/compiler/compiler/core/account/compute_key.out deleted file mode 100644 index 7a7288db8c..0000000000 --- a/tests/expectations/compiler/compiler/core/account/compute_key.out +++ /dev/null @@ -1,5 +0,0 @@ ---- -namespace: Compile -expectation: Fail -outputs: - - "Error [ETYC0372010]: The type ComputeKey is a reserved core type name.\n --> compiler-test:4:35\n |\n 4 | function main(public compute_key: ComputeKey, a: bool) -> bool {\n | ^^^^^^^^^^\n" diff --git a/tests/expectations/compiler/compiler/core/account/private_key.out b/tests/expectations/compiler/compiler/core/account/private_key.out deleted file mode 100644 index 302300b428..0000000000 --- a/tests/expectations/compiler/compiler/core/account/private_key.out +++ /dev/null @@ -1,5 +0,0 @@ ---- -namespace: Compile -expectation: Fail -outputs: - - "Error [ETYC0372010]: The type PrivateKey is a reserved core type name.\n --> compiler-test:4:35\n |\n 4 | function main(public private_key: PrivateKey, a: bool) -> bool {\n | ^^^^^^^^^^\n" diff --git a/tests/expectations/compiler/compiler/core/account/record.out b/tests/expectations/compiler/compiler/core/account/record.out deleted file mode 100644 index 42f0d01267..0000000000 --- a/tests/expectations/compiler/compiler/core/account/record.out +++ /dev/null @@ -1,5 +0,0 @@ ---- -namespace: Compile -expectation: Fail -outputs: - - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'record'\n --> compiler-test:4:22\n |\n 4 | function main(public record: Record, a: bool) -> bool {\n | ^^^^^^" diff --git a/tests/expectations/compiler/compiler/core/account/signature.out b/tests/expectations/compiler/compiler/core/account/signature.out deleted file mode 100644 index bb335934a5..0000000000 --- a/tests/expectations/compiler/compiler/core/account/signature.out +++ /dev/null @@ -1,5 +0,0 @@ ---- -namespace: Compile -expectation: Fail -outputs: - - "Error [ETYC0372010]: The type Signature is a reserved core type name.\n --> compiler-test:4:33\n |\n 4 | function main(public signature: Signature, a: bool) -> bool {\n | ^^^^^^^^^\n" diff --git a/tests/expectations/compiler/compiler/core/account/view_key.out b/tests/expectations/compiler/compiler/core/account/view_key.out deleted file mode 100644 index 7026212558..0000000000 --- a/tests/expectations/compiler/compiler/core/account/view_key.out +++ /dev/null @@ -1,5 +0,0 @@ ---- -namespace: Compile -expectation: Fail -outputs: - - "Error [ETYC0372010]: The type ViewKey is a reserved core type name.\n --> compiler-test:4:32\n |\n 4 | function main(public view_key: ViewKey, a: bool) -> bool {\n | ^^^^^^^\n" From 10c9bb1c288879d9e1b6f517fcbf52c762899c0d Mon Sep 17 00:00:00 2001 From: collin <16715212+collinc97@users.noreply.github.com> Date: Thu, 28 Jul 2022 14:14:25 -0700 Subject: [PATCH 3/3] fix directory bug for test expectations --- .../expectations/compiler/{compiler => }/address/binary.out | 0 .../expectations/compiler/{compiler => }/address/branch.out | 0 tests/expectations/compiler/{compiler => }/address/equal.out | 0 .../expectations/compiler/{compiler => }/address/gt_fail.out | 0 .../compiler/{compiler => }/address/gte_fail.out | 0 .../expectations/compiler/{compiler => }/address/lt_fail.out | 0 .../compiler/{compiler => }/address/lte_fail.out | 0 .../expectations/compiler/{compiler => }/address/ternary.out | 0 tests/expectations/compiler/{compiler => }/boolean/and.out | 0 .../compiler/{compiler => }/boolean/conditional.out | 0 tests/expectations/compiler/{compiler => }/boolean/equal.out | 0 .../compiler/{compiler => }/boolean/not_equal.out | 0 .../compiler/{compiler => }/boolean/operator_methods.out | 0 tests/expectations/compiler/{compiler => }/boolean/or.out | 0 .../compiler/{compiler => }/char/invalid_char.out | 0 tests/expectations/compiler/{compiler => }/char/neq.out | 0 tests/expectations/compiler/{compiler => }/char/out.out | 0 tests/expectations/compiler/{compiler => }/char/string.out | 0 .../circuits/circuit_function_namespace_conflict_fail.out | 0 .../{compiler => }/circuits/duplicate_circuit_variable.out | 0 .../{compiler => }/circuits/duplicate_name_context.out | 0 .../expectations/compiler/{compiler => }/circuits/inline.out | 0 .../compiler/{compiler => }/circuits/inline_fail.out | 0 .../compiler/{compiler => }/circuits/inline_member_fail.out | 0 .../compiler/{compiler => }/circuits/inline_member_pass.out | 0 .../compiler/{compiler => }/circuits/inline_undefined.out | 0 .../compiler/{compiler => }/circuits/member_variable.out | 0 .../{compiler => }/circuits/member_variable_fail.out | 0 .../expectations/compiler/{compiler => }/console/assert.out | 0 .../compiler/{compiler => }/console/conditional_assert.out | 0 tests/expectations/compiler/{compiler => }/console/error.out | 0 tests/expectations/compiler/{compiler => }/console/log.out | 0 .../compiler/{compiler => }/console/log_conditional.out | 0 .../compiler/{compiler => }/console/log_fail.out | 0 .../compiler/{compiler => }/console/log_input.out | 0 .../compiler/{compiler => }/console/log_parameter.out | 0 .../compiler/{compiler => }/console/log_parameter_many.out | 0 .../{compiler => }/console/log_parameter_unkown_fail.out | 0 .../compiler/{compiler => }/console/log_string.out | 0 .../compiler/{compiler => }/core/algorithms/bhp.out | 0 .../compiler/{compiler => }/core/algorithms/pedersen.out | 0 .../{compiler => }/core/algorithms/pedersen_fail.out | 0 .../compiler/{compiler => }/core/algorithms/poseidon.out | 0 .../compiler/{compiler => }/definition/out_of_order.out | 0 .../definition/use_decl_variable_as_assign_fail.out | 0 tests/expectations/compiler/{compiler => }/field/add.out | 0 tests/expectations/compiler/{compiler => }/field/div.out | 0 tests/expectations/compiler/{compiler => }/field/eq.out | 0 tests/expectations/compiler/{compiler => }/field/field.out | 0 tests/expectations/compiler/{compiler => }/field/mul.out | 0 tests/expectations/compiler/{compiler => }/field/negate.out | 0 .../{compiler => }/field/no_space_between_literal.out | 0 .../compiler/{compiler => }/field/operator_methods.out | 0 tests/expectations/compiler/{compiler => }/field/pow.out | 0 tests/expectations/compiler/{compiler => }/field/sub.out | 0 tests/expectations/compiler/{compiler => }/field/ternary.out | 0 .../compiler/{compiler => }/function/conditional_return.out | 0 .../{compiler => }/function/duplicate_definition_fail.out | 0 .../{compiler => }/function/duplicate_parameter_fail.out | 0 .../compiler/{compiler => }/function/iteration.out | 0 .../compiler/{compiler => }/function/iteration_repeated.out | 0 .../compiler/{compiler => }/function/no_return_fail.out | 0 .../compiler/{compiler => }/function/repeated.out | 0 .../expectations/compiler/{compiler => }/function/return.out | 0 .../compiler/{compiler => }/function/scope_fail.out | 0 .../function/shadow_function_with_input_fail.out | 0 .../{compiler => }/function/shadow_parameter_fail.out | 0 .../compiler/{compiler => }/function/undefined_fail.out | 0 tests/expectations/compiler/{compiler => }/group/add.out | 0 .../expectations/compiler/{compiler => }/group/assert_eq.out | 0 .../compiler/{compiler => }/group/both_sign_high.out | 0 .../compiler/{compiler => }/group/both_sign_inferred.out | 0 .../compiler/{compiler => }/group/both_sign_low.out | 0 tests/expectations/compiler/{compiler => }/group/eq.out | 0 tests/expectations/compiler/{compiler => }/group/input.out | 0 .../compiler/{compiler => }/group/mult_by_group_fail.out | 0 .../compiler/{compiler => }/group/mult_by_scalar.out | 0 tests/expectations/compiler/{compiler => }/group/negate.out | 0 .../{compiler => }/group/no_space_between_literal.out | 0 tests/expectations/compiler/{compiler => }/group/one.out | 0 .../compiler/{compiler => }/group/operator_methods.out | 0 tests/expectations/compiler/{compiler => }/group/point.out | 0 .../compiler/{compiler => }/group/point_input.out | 0 .../compiler/{compiler => }/group/positive_and_negative.out | 0 tests/expectations/compiler/{compiler => }/group/sub.out | 0 tests/expectations/compiler/{compiler => }/group/ternary.out | 0 tests/expectations/compiler/{compiler => }/group/x_and_y.out | 0 .../compiler/{compiler => }/group/x_sign_high.out | 0 .../compiler/{compiler => }/group/x_sign_inferred.out | 0 .../compiler/{compiler => }/group/x_sign_low.out | 0 .../compiler/{compiler => }/group/y_sign_high.out | 0 .../compiler/{compiler => }/group/y_sign_inferred.out | 0 .../compiler/{compiler => }/group/y_sign_low.out | 0 tests/expectations/compiler/{compiler => }/group/zero.out | 0 .../{compiler => }/input_files/program_input/main.out | 0 .../{compiler => }/input_files/program_input/main_field.out | 0 .../{compiler => }/input_files/program_input/main_group.out | 0 .../input_files/program_input_constants/main.out | 0 .../input_files/program_input_constants/main_field.out | 0 .../input_files/program_input_constants/main_group.out | 0 .../input_files/program_input_constants/main_multiple.out | 0 .../compiler/{compiler => }/integers/i128/add.out | 0 .../compiler/{compiler => }/integers/i128/and.out | 0 .../compiler/{compiler => }/integers/i128/console_assert.out | 0 .../compiler/{compiler => }/integers/i128/div.out | 0 .../compiler/{compiler => }/integers/i128/eq.out | 0 .../compiler/{compiler => }/integers/i128/ge.out | 0 .../compiler/{compiler => }/integers/i128/gt.out | 0 .../compiler/{compiler => }/integers/i128/le.out | 0 .../compiler/{compiler => }/integers/i128/lt.out | 0 .../compiler/{compiler => }/integers/i128/max.out | 0 .../compiler/{compiler => }/integers/i128/max_fail.out | 0 .../compiler/{compiler => }/integers/i128/min.out | 0 .../compiler/{compiler => }/integers/i128/min_fail.out | 0 .../compiler/{compiler => }/integers/i128/mul.out | 0 .../compiler/{compiler => }/integers/i128/ne.out | 0 .../compiler/{compiler => }/integers/i128/negate.out | 0 .../compiler/{compiler => }/integers/i128/negate_min.out | 0 .../compiler/{compiler => }/integers/i128/negate_zero.out | 0 .../integers/i128/no_space_between_literal.out | 0 .../{compiler => }/integers/i128/operator_methods.out | 0 .../compiler/{compiler => }/integers/i128/or.out | 0 .../compiler/{compiler => }/integers/i128/pow.out | 0 .../compiler/{compiler => }/integers/i128/shl.out | 0 .../compiler/{compiler => }/integers/i128/shr.out | 0 .../compiler/{compiler => }/integers/i128/sub.out | 0 .../compiler/{compiler => }/integers/i128/ternary.out | 0 .../compiler/{compiler => }/integers/i128/xor.out | 0 .../compiler/{compiler => }/integers/i16/add.out | 0 .../compiler/{compiler => }/integers/i16/and.out | 0 .../compiler/{compiler => }/integers/i16/console_assert.out | 0 .../compiler/{compiler => }/integers/i16/div.out | 0 .../expectations/compiler/{compiler => }/integers/i16/eq.out | 0 .../expectations/compiler/{compiler => }/integers/i16/ge.out | 0 .../expectations/compiler/{compiler => }/integers/i16/gt.out | 0 .../expectations/compiler/{compiler => }/integers/i16/le.out | 0 .../expectations/compiler/{compiler => }/integers/i16/lt.out | 0 .../compiler/{compiler => }/integers/i16/max.out | 0 .../compiler/{compiler => }/integers/i16/max_fail.out | 0 .../compiler/{compiler => }/integers/i16/min.out | 0 .../compiler/{compiler => }/integers/i16/min_fail.out | 0 .../compiler/{compiler => }/integers/i16/mul.out | 0 .../expectations/compiler/{compiler => }/integers/i16/ne.out | 0 .../compiler/{compiler => }/integers/i16/negate.out | 0 .../compiler/{compiler => }/integers/i16/negate_min_fail.out | 0 .../compiler/{compiler => }/integers/i16/negate_zero.out | 0 .../{compiler => }/integers/i16/no_space_between_literal.out | 0 .../{compiler => }/integers/i16/operator_methods.out | 0 .../expectations/compiler/{compiler => }/integers/i16/or.out | 0 .../compiler/{compiler => }/integers/i16/pow.out | 0 .../compiler/{compiler => }/integers/i16/shl.out | 0 .../compiler/{compiler => }/integers/i16/shr.out | 0 .../compiler/{compiler => }/integers/i16/sub.out | 0 .../compiler/{compiler => }/integers/i16/ternary.out | 0 .../compiler/{compiler => }/integers/i16/xor.out | 0 .../compiler/{compiler => }/integers/i32/add.out | 0 .../compiler/{compiler => }/integers/i32/and.out | 0 .../compiler/{compiler => }/integers/i32/console_assert.out | 0 .../compiler/{compiler => }/integers/i32/div.out | 0 .../expectations/compiler/{compiler => }/integers/i32/eq.out | 0 .../expectations/compiler/{compiler => }/integers/i32/ge.out | 0 .../expectations/compiler/{compiler => }/integers/i32/gt.out | 0 .../expectations/compiler/{compiler => }/integers/i32/le.out | 0 .../expectations/compiler/{compiler => }/integers/i32/lt.out | 0 .../compiler/{compiler => }/integers/i32/max.out | 0 .../compiler/{compiler => }/integers/i32/max_fail.out | 0 .../compiler/{compiler => }/integers/i32/min.out | 0 .../compiler/{compiler => }/integers/i32/min_fail.out | 0 .../compiler/{compiler => }/integers/i32/mul.out | 0 .../expectations/compiler/{compiler => }/integers/i32/ne.out | 0 .../compiler/{compiler => }/integers/i32/negate.out | 0 .../compiler/{compiler => }/integers/i32/negate_min.out | 0 .../compiler/{compiler => }/integers/i32/negate_zero.out | 0 .../{compiler => }/integers/i32/no_space_between_literal.out | 0 .../{compiler => }/integers/i32/operator_methods.out | 0 .../expectations/compiler/{compiler => }/integers/i32/or.out | 0 .../compiler/{compiler => }/integers/i32/pow.out | 0 .../compiler/{compiler => }/integers/i32/shl.out | 0 .../compiler/{compiler => }/integers/i32/shr.out | 0 .../compiler/{compiler => }/integers/i32/sub.out | 0 .../compiler/{compiler => }/integers/i32/ternary.out | 0 .../compiler/{compiler => }/integers/i32/xor.out | 0 .../compiler/{compiler => }/integers/i64/add.out | 0 .../compiler/{compiler => }/integers/i64/and.out | 0 .../compiler/{compiler => }/integers/i64/console_assert.out | 0 .../compiler/{compiler => }/integers/i64/div.out | 0 .../expectations/compiler/{compiler => }/integers/i64/eq.out | 0 .../expectations/compiler/{compiler => }/integers/i64/ge.out | 0 .../expectations/compiler/{compiler => }/integers/i64/gt.out | 0 .../expectations/compiler/{compiler => }/integers/i64/le.out | 0 .../expectations/compiler/{compiler => }/integers/i64/lt.out | 0 .../compiler/{compiler => }/integers/i64/max.out | 0 .../compiler/{compiler => }/integers/i64/max_fail.out | 0 .../compiler/{compiler => }/integers/i64/min.out | 0 .../compiler/{compiler => }/integers/i64/min_fail.out | 0 .../compiler/{compiler => }/integers/i64/mul.out | 0 .../expectations/compiler/{compiler => }/integers/i64/ne.out | 0 .../compiler/{compiler => }/integers/i64/negate.out | 0 .../compiler/{compiler => }/integers/i64/negate_min.out | 0 .../compiler/{compiler => }/integers/i64/negate_zero.out | 0 .../{compiler => }/integers/i64/no_space_between_literal.out | 0 .../{compiler => }/integers/i64/operator_methods.out | 0 .../expectations/compiler/{compiler => }/integers/i64/or.out | 0 .../compiler/{compiler => }/integers/i64/pow.out | 0 .../compiler/{compiler => }/integers/i64/shl.out | 0 .../compiler/{compiler => }/integers/i64/shr.out | 0 .../compiler/{compiler => }/integers/i64/sub.out | 0 .../compiler/{compiler => }/integers/i64/ternary.out | 0 .../compiler/{compiler => }/integers/i64/xor.out | 0 .../expectations/compiler/{compiler => }/integers/i8/add.out | 0 .../expectations/compiler/{compiler => }/integers/i8/and.out | 0 .../compiler/{compiler => }/integers/i8/console_assert.out | 0 .../expectations/compiler/{compiler => }/integers/i8/div.out | 0 .../expectations/compiler/{compiler => }/integers/i8/eq.out | 0 .../expectations/compiler/{compiler => }/integers/i8/ge.out | 0 .../expectations/compiler/{compiler => }/integers/i8/gt.out | 0 .../expectations/compiler/{compiler => }/integers/i8/le.out | 0 .../expectations/compiler/{compiler => }/integers/i8/lt.out | 0 .../expectations/compiler/{compiler => }/integers/i8/max.out | 0 .../compiler/{compiler => }/integers/i8/max_fail.out | 0 .../expectations/compiler/{compiler => }/integers/i8/min.out | 0 .../compiler/{compiler => }/integers/i8/min_fail.out | 0 .../expectations/compiler/{compiler => }/integers/i8/mul.out | 0 .../expectations/compiler/{compiler => }/integers/i8/ne.out | 0 .../compiler/{compiler => }/integers/i8/negate.out | 0 .../compiler/{compiler => }/integers/i8/negate_min.out | 0 .../compiler/{compiler => }/integers/i8/negate_zero.out | 0 .../{compiler => }/integers/i8/no_space_between_literal.out | 0 .../compiler/{compiler => }/integers/i8/operator_methods.out | 0 .../expectations/compiler/{compiler => }/integers/i8/or.out | 0 .../expectations/compiler/{compiler => }/integers/i8/pow.out | 0 .../expectations/compiler/{compiler => }/integers/i8/shl.out | 0 .../expectations/compiler/{compiler => }/integers/i8/shr.out | 0 .../expectations/compiler/{compiler => }/integers/i8/sub.out | 0 .../compiler/{compiler => }/integers/i8/ternary.out | 0 .../expectations/compiler/{compiler => }/integers/i8/xor.out | 0 .../compiler/{compiler => }/integers/u128/add.out | 0 .../compiler/{compiler => }/integers/u128/and.out | 0 .../compiler/{compiler => }/integers/u128/console_assert.out | 0 .../compiler/{compiler => }/integers/u128/div.out | 0 .../compiler/{compiler => }/integers/u128/eq.out | 0 .../compiler/{compiler => }/integers/u128/ge.out | 0 .../compiler/{compiler => }/integers/u128/gt.out | 0 .../compiler/{compiler => }/integers/u128/le.out | 0 .../compiler/{compiler => }/integers/u128/lt.out | 0 .../compiler/{compiler => }/integers/u128/max.out | 0 .../compiler/{compiler => }/integers/u128/max_fail.out | 0 .../compiler/{compiler => }/integers/u128/min.out | 0 .../compiler/{compiler => }/integers/u128/min_fail.out | 0 .../compiler/{compiler => }/integers/u128/mul.out | 0 .../compiler/{compiler => }/integers/u128/ne.out | 0 .../integers/u128/no_space_between_literal.out | 0 .../{compiler => }/integers/u128/operator_methods.out | 0 .../compiler/{compiler => }/integers/u128/or.out | 0 .../compiler/{compiler => }/integers/u128/pow.out | 0 .../compiler/{compiler => }/integers/u128/shl.out | 0 .../compiler/{compiler => }/integers/u128/shr.out | 0 .../compiler/{compiler => }/integers/u128/sub.out | 0 .../compiler/{compiler => }/integers/u128/ternary.out | 0 .../compiler/{compiler => }/integers/u128/xor.out | 0 .../compiler/{compiler => }/integers/u16/add.out | 0 .../compiler/{compiler => }/integers/u16/and.out | 0 .../compiler/{compiler => }/integers/u16/console_assert.out | 0 .../compiler/{compiler => }/integers/u16/div.out | 0 .../expectations/compiler/{compiler => }/integers/u16/eq.out | 0 .../expectations/compiler/{compiler => }/integers/u16/ge.out | 0 .../expectations/compiler/{compiler => }/integers/u16/gt.out | 0 .../expectations/compiler/{compiler => }/integers/u16/le.out | 0 .../expectations/compiler/{compiler => }/integers/u16/lt.out | 0 .../compiler/{compiler => }/integers/u16/max.out | 0 .../compiler/{compiler => }/integers/u16/max_fail.out | 0 .../compiler/{compiler => }/integers/u16/min.out | 0 .../compiler/{compiler => }/integers/u16/min_fail.out | 0 .../compiler/{compiler => }/integers/u16/mul.out | 0 .../expectations/compiler/{compiler => }/integers/u16/ne.out | 0 .../{compiler => }/integers/u16/no_space_between_literal.out | 0 .../{compiler => }/integers/u16/operator_methods.out | 0 .../expectations/compiler/{compiler => }/integers/u16/or.out | 0 .../compiler/{compiler => }/integers/u16/pow.out | 0 .../compiler/{compiler => }/integers/u16/shl.out | 0 .../compiler/{compiler => }/integers/u16/shr.out | 0 .../compiler/{compiler => }/integers/u16/sub.out | 0 .../compiler/{compiler => }/integers/u16/ternary.out | 0 .../compiler/{compiler => }/integers/u16/xor.out | 0 .../compiler/{compiler => }/integers/u32/add.out | 0 .../compiler/{compiler => }/integers/u32/and.out | 0 .../compiler/{compiler => }/integers/u32/console_assert.out | 0 .../compiler/{compiler => }/integers/u32/div.out | 0 .../expectations/compiler/{compiler => }/integers/u32/eq.out | 0 .../expectations/compiler/{compiler => }/integers/u32/ge.out | 0 .../expectations/compiler/{compiler => }/integers/u32/gt.out | 0 .../expectations/compiler/{compiler => }/integers/u32/le.out | 0 .../expectations/compiler/{compiler => }/integers/u32/lt.out | 0 .../compiler/{compiler => }/integers/u32/max.out | 0 .../compiler/{compiler => }/integers/u32/max_fail.out | 0 .../compiler/{compiler => }/integers/u32/min.out | 0 .../compiler/{compiler => }/integers/u32/min_fail.out | 0 .../compiler/{compiler => }/integers/u32/mul.out | 0 .../expectations/compiler/{compiler => }/integers/u32/ne.out | 0 .../{compiler => }/integers/u32/no_space_between_literal.out | 0 .../{compiler => }/integers/u32/operator_methods.out | 0 .../expectations/compiler/{compiler => }/integers/u32/or.out | 0 .../compiler/{compiler => }/integers/u32/pow.out | 0 .../compiler/{compiler => }/integers/u32/shl.out | 0 .../compiler/{compiler => }/integers/u32/shr.out | 0 .../compiler/{compiler => }/integers/u32/sub.out | 0 .../compiler/{compiler => }/integers/u32/ternary.out | 0 .../compiler/{compiler => }/integers/u32/xor.out | 0 .../compiler/{compiler => }/integers/u64/add.out | 0 .../compiler/{compiler => }/integers/u64/and.out | 0 .../compiler/{compiler => }/integers/u64/console_assert.out | 0 .../compiler/{compiler => }/integers/u64/div.out | 0 .../expectations/compiler/{compiler => }/integers/u64/eq.out | 0 .../expectations/compiler/{compiler => }/integers/u64/ge.out | 0 .../expectations/compiler/{compiler => }/integers/u64/gt.out | 0 .../expectations/compiler/{compiler => }/integers/u64/le.out | 0 .../expectations/compiler/{compiler => }/integers/u64/lt.out | 0 .../compiler/{compiler => }/integers/u64/max.out | 0 .../compiler/{compiler => }/integers/u64/max_fail.out | 0 .../compiler/{compiler => }/integers/u64/min.out | 0 .../compiler/{compiler => }/integers/u64/min_fail.out | 0 .../compiler/{compiler => }/integers/u64/mul.out | 0 .../expectations/compiler/{compiler => }/integers/u64/ne.out | 0 .../{compiler => }/integers/u64/no_space_between_literal.out | 0 .../{compiler => }/integers/u64/operator_methods.out | 0 .../expectations/compiler/{compiler => }/integers/u64/or.out | 0 .../compiler/{compiler => }/integers/u64/pow.out | 0 .../compiler/{compiler => }/integers/u64/shl.out | 0 .../compiler/{compiler => }/integers/u64/shr.out | 0 .../compiler/{compiler => }/integers/u64/sub.out | 0 .../compiler/{compiler => }/integers/u64/ternary.out | 0 .../compiler/{compiler => }/integers/u64/xor.out | 0 .../expectations/compiler/{compiler => }/integers/u8/add.out | 0 .../expectations/compiler/{compiler => }/integers/u8/and.out | 0 .../compiler/{compiler => }/integers/u8/console_assert.out | 0 .../expectations/compiler/{compiler => }/integers/u8/div.out | 0 .../expectations/compiler/{compiler => }/integers/u8/eq.out | 0 .../expectations/compiler/{compiler => }/integers/u8/ge.out | 0 .../expectations/compiler/{compiler => }/integers/u8/gt.out | 0 .../expectations/compiler/{compiler => }/integers/u8/le.out | 0 .../expectations/compiler/{compiler => }/integers/u8/lt.out | 0 .../expectations/compiler/{compiler => }/integers/u8/max.out | 0 .../compiler/{compiler => }/integers/u8/max_fail.out | 0 .../expectations/compiler/{compiler => }/integers/u8/min.out | 0 .../compiler/{compiler => }/integers/u8/min_fail.out | 0 .../expectations/compiler/{compiler => }/integers/u8/mul.out | 0 .../expectations/compiler/{compiler => }/integers/u8/ne.out | 0 .../{compiler => }/integers/u8/no_space_between_literal.out | 0 .../compiler/{compiler => }/integers/u8/operator_methods.out | 0 .../expectations/compiler/{compiler => }/integers/u8/or.out | 0 .../expectations/compiler/{compiler => }/integers/u8/pow.out | 0 .../expectations/compiler/{compiler => }/integers/u8/shl.out | 0 .../expectations/compiler/{compiler => }/integers/u8/shr.out | 0 .../expectations/compiler/{compiler => }/integers/u8/sub.out | 0 .../compiler/{compiler => }/integers/u8/ternary.out | 0 .../expectations/compiler/{compiler => }/integers/u8/xor.out | 0 .../compiler/{compiler => }/mutability/cond_mut.out | 0 .../{compiler => }/mutability/function_input_mut.out | 0 .../compiler/{compiler => }/mutability/let_mut_nested.out | 0 .../compiler/{compiler => }/records/balance_wrong_ty.out | 0 .../compiler/{compiler => }/records/declaration.out | 0 .../{compiler => }/records/duplicate_circuit_name_fail.out | 0 .../compiler/{compiler => }/records/duplicate_var_fail.out | 0 .../compiler/{compiler => }/records/init_expression.out | 0 .../{compiler => }/records/init_expression_shorthand.out | 0 .../{compiler => }/records/init_expression_type_fail.out | 0 .../{compiler => }/records/init_expression_var_fail.out | 0 .../compiler/{compiler => }/records/no_owner_fail.out | 0 .../compiler/{compiler => }/records/owner_wrong_ty.out | 0 tests/expectations/compiler/{compiler => }/scalar/add.out | 0 tests/expectations/compiler/{compiler => }/scalar/cmp.out | 0 tests/expectations/compiler/{compiler => }/scalar/div.out | 0 tests/expectations/compiler/{compiler => }/scalar/eq.out | 0 .../compiler/{compiler => }/scalar/group_mul.out | 0 tests/expectations/compiler/{compiler => }/scalar/mul.out | 0 .../{compiler => }/scalar/no_space_between_literal.out | 0 .../compiler/{compiler => }/scalar/operator_methods.out | 0 tests/expectations/compiler/{compiler => }/scalar/scalar.out | 0 .../expectations/compiler/{compiler => }/scalar/ternary.out | 0 .../compiler/{compiler => }/statements/all_loops.out | 0 .../compiler/{compiler => }/statements/all_loops_fail.out | 0 .../compiler/{compiler => }/statements/assign_fail.out | 0 .../compiler/{compiler => }/statements/assign_ternary.out | 0 .../compiler/{compiler => }/statements/block.out | 0 .../compiler/{compiler => }/statements/chain.out | 0 .../{compiler => }/statements/compare_diff_types_fail.out | 0 .../statements/compare_invalid_negates_fail.out | 0 .../{compiler => }/statements/duplicate_variable.out | 0 .../compiler/{compiler => }/statements/for_loop.out | 0 .../compiler/{compiler => }/statements/iteration_basic.out | 0 .../{compiler => }/statements/iteration_variable.out | 0 .../compiler/{compiler => }/statements/multiple_returns.out | 0 .../compiler/{compiler => }/statements/mutate.out | 0 .../{compiler => }/statements/non_existant_var_exp_fail.out | 0 .../{compiler => }/statements/non_existant_vars_mul_fail.out | 0 .../statements/ternary_explicit_and_implicit.out | 0 tests/expectations/compiler/{compiler => }/tuple/access.out | 0 .../compiler/{compiler => }/tuple/access_negative_fail.out | 0 .../{compiler => }/tuple/access_out_of_bounds_fail.out | 0 .../compiler/{compiler => }/tuple/declare_fail.out | 0 .../compiler/{compiler => }/tuple/function_return.out | 0 .../{compiler => }/tuple/function_return_single_fail.out | 0 .../{compiler => }/tuple/function_return_zero_fail.out | 0 .../compiler/{compiler => }/tuple/return_statement_fail.out | 0 .../compiler/{compiler => }/tuple/tuple_not_allowed.out | 0 .../expectations/compiler/{compiler => }/tuple/type_fail.out | 0 .../parser/{parser => }/expression/access/call.out | 0 .../parser/{parser => }/expression/array_init_fail.out | 0 .../parser/{parser => }/expression/array_inline_fail.out | 0 .../parser/{parser => }/expression/binary/add.out | 0 .../parser/{parser => }/expression/binary/add_wrapped.out | 0 .../parser/{parser => }/expression/binary/and.out | 0 .../parser/{parser => }/expression/binary/bit_and.out | 0 .../parser/{parser => }/expression/binary/bit_or.out | 0 .../parser/{parser => }/expression/binary/bit_xor.out | 0 .../parser/{parser => }/expression/binary/div.out | 0 .../parser/{parser => }/expression/binary/div_wrapped.out | 0 .../parser/{parser => }/expression/binary/eq.out | 0 .../parser/{parser => }/expression/binary/eq_fail.out | 0 .../parser/{parser => }/expression/binary/ge.out | 0 .../parser/{parser => }/expression/binary/ge_fail.out | 0 .../parser/{parser => }/expression/binary/gt.out | 0 .../parser/{parser => }/expression/binary/gt_fail.out | 0 .../parser/{parser => }/expression/binary/le.out | 0 .../parser/{parser => }/expression/binary/le_fail.out | 0 .../parser/{parser => }/expression/binary/lt.out | 0 .../parser/{parser => }/expression/binary/lt_fail.out | 0 .../parser/{parser => }/expression/binary/mul.out | 0 .../parser/{parser => }/expression/binary/mul_wrapped.out | 0 .../parser/{parser => }/expression/binary/nand.out | 0 .../parser/{parser => }/expression/binary/neq.out | 0 .../parser/{parser => }/expression/binary/neq_fail.out | 0 .../parser/{parser => }/expression/binary/nor.out | 0 .../parser/{parser => }/expression/binary/or.out | 0 .../parser/{parser => }/expression/binary/pow.out | 0 .../parser/{parser => }/expression/binary/pow_wrapped.out | 0 .../parser/{parser => }/expression/binary/shl.out | 0 .../parser/{parser => }/expression/binary/shl_wrapped.out | 0 .../parser/{parser => }/expression/binary/shr.out | 0 .../parser/{parser => }/expression/binary/shr_wrapped.out | 0 .../parser/{parser => }/expression/binary/sub.out | 0 .../parser/{parser => }/expression/binary/sub_wrapped.out | 0 .../parser/{parser => }/expression/circuit_init_fail.out | 0 tests/expectations/parser/{parser => }/expression/ident.out | 0 .../parser/{parser => }/expression/literal/address.out | 0 .../parser/{parser => }/expression/literal/address_fail.out | 0 .../parser/{parser => }/expression/literal/address_parse.out | 0 .../parser/{parser => }/expression/literal/bool.out | 0 .../parser/{parser => }/expression/literal/bool_parse.out | 0 .../parser/{parser => }/expression/literal/char.out | 0 .../parser/{parser => }/expression/literal/char_fail.out | 0 .../parser/{parser => }/expression/literal/char_parse.out | 0 .../parser/{parser => }/expression/literal/comment.out | 0 .../parser/{parser => }/expression/literal/comment_fail.out | 0 .../{parser => }/expression/literal/formatted_string.out | 0 .../parser/{parser => }/expression/literal/group.out | 0 .../parser/{parser => }/expression/literal/group_fail.out | 0 .../parser/{parser => }/expression/literal/int.out | 0 .../parser/{parser => }/expression/literal/int_fail.out | 0 .../{parser => }/expression/literal/int_parse/field.out | 0 .../{parser => }/expression/literal/int_parse/field_fail.out | 0 .../{parser => }/expression/literal/int_parse/i128.out | 0 .../parser/{parser => }/expression/literal/int_parse/i16.out | 0 .../parser/{parser => }/expression/literal/int_parse/i32.out | 0 .../parser/{parser => }/expression/literal/int_parse/i64.out | 0 .../parser/{parser => }/expression/literal/int_parse/i8.out | 0 .../{parser => }/expression/literal/int_parse/implicit.out | 0 .../{parser => }/expression/literal/int_parse/mono_group.out | 0 .../{parser => }/expression/literal/int_parse/scalar.out | 0 .../{parser => }/expression/literal/int_parse/u128.out | 0 .../parser/{parser => }/expression/literal/int_parse/u16.out | 0 .../parser/{parser => }/expression/literal/int_parse/u32.out | 0 .../parser/{parser => }/expression/literal/int_parse/u64.out | 0 .../parser/{parser => }/expression/literal/int_parse/u8.out | 0 .../parser/{parser => }/expression/literal/postfix_types.out | 0 .../parser/{parser => }/expression/literal/string.out | 0 .../parser/{parser => }/expression/literal/string_fail.out | 0 .../expectations/parser/{parser => }/expression/ternary.out | 0 .../parser/{parser => }/expression/token_format.out | 0 .../parser/{parser => }/expression/unary/abs.out | 0 .../parser/{parser => }/expression/unary/abs_wrapped.out | 0 .../parser/{parser => }/expression/unary/double.out | 0 .../parser/{parser => }/expression/unary/inv.out | 0 .../parser/{parser => }/expression/unary/neg.out | 0 .../parser/{parser => }/expression/unary/not.out | 0 .../parser/{parser => }/expression/unary/sqrt.out | 0 .../parser/{parser => }/expression/unary/square.out | 0 .../{parser => }/functions/annotated_arg_not_ident.out | 0 .../parser/{parser => }/functions/annotated_context_fail.out | 0 .../parser/{parser => }/functions/bounded_recursion.out | 0 .../parser/{parser => }/functions/const_input.out | 0 .../parser/{parser => }/functions/const_param.out | 0 .../{parser => }/functions/const_public_param_fail.out | 0 tests/expectations/parser/{parser => }/functions/empty2.out | 0 .../parser/{parser => }/functions/escape_fail.out | 0 .../parser/{parser => }/functions/ident_token_fail.out | 0 .../parser/{parser => }/functions/infinite_recursion.out | 0 .../parser/{parser => }/functions/mut_input_fail.out | 0 tests/expectations/parser/{parser => }/functions/params.out | 0 .../parser/{parser => }/functions/params_return.out | 0 .../{parser => }/functions/public_const_param_fail.out | 0 .../parser/{parser => }/functions/public_param.out | 0 tests/expectations/parser/{parser => }/functions/return.out | 0 .../parser/{parser => }/functions/test_keyword_fail.out | 0 .../expectations/parser/{parser => }/inputs/input_const.out | 0 .../parser/{parser => }/inputs/input_constant.out | 0 .../{parser => }/inputs/input_constant_public_fail.out | 0 tests/expectations/parser/{parser => }/inputs/input_fail.out | 0 .../expectations/parser/{parser => }/inputs/input_public.out | 0 .../{parser => }/inputs/input_public_constant_fail.out | 0 .../parser/{parser => }/program/backslash_eof.out | 0 .../parser/{parser => }/program/bidi_comment_2_fail.out | 0 .../parser/{parser => }/program/bidi_comment_fail.out | 0 .../expectations/parser/{parser => }/program/dollar_eof.out | 0 .../parser/{parser => }/program/escape_u8_eof.out | 0 tests/expectations/parser/{parser => }/program/hex_eof.out | 0 tests/expectations/parser/{parser => }/program/pipe_eof.out | 0 tests/expectations/parser/{parser => }/program/q_eof.out | 0 tests/expectations/parser/{parser => }/program/sq_eof.out | 0 tests/expectations/parser/{parser => }/program/tilde_eof.out | 0 .../{parser => }/program/unclosed_unicode_eof_fail.out | 0 .../parser/{parser => }/serialize/one_plus_one.out | 0 .../parser/{parser => }/serialize/parser_error.out | 0 tests/expectations/parser/{parser => }/statement/assign.out | 0 tests/expectations/parser/{parser => }/statement/block.out | 0 .../parser/{parser => }/statement/conditional.out | 0 .../parser/{parser => }/statement/conditional_fail.out | 0 tests/expectations/parser/{parser => }/statement/console.out | 0 .../parser/{parser => }/statement/console_fail.out | 0 .../parser/{parser => }/statement/definition.out | 0 .../parser/{parser => }/statement/definition_fail.out | 0 .../parser/{parser => }/statement/expression.out | 0 .../parser/{parser => }/statement/expression_fail.out | 0 .../parser/{parser => }/statement/hex_int_fail.out | 0 .../expectations/parser/{parser => }/statement/iteration.out | 0 .../parser/{parser => }/statement/let_mut_recover.out | 0 tests/expectations/parser/{parser => }/statement/return.out | 0 .../parser/{parser => }/statement/return_fail.out | 0 .../expectations/parser/{parser => }/unreachable/define.out | 0 .../parser/{parser => }/unreachable/eat_ident.out | 0 .../expectations/parser/{parser => }/unreachable/eat_int.out | 0 .../unreachable/equality_and_order_expression.out | 0 .../parser/{parser => }/unreachable/expect_ident.out | 0 .../parser/{parser => }/unreachable/math_op_fail.out | 0 .../parser/{parser => }/unreachable/math_op_pass.out | 0 .../parser/{parser => }/unreachable/postfix_fail.out | 0 .../parser/{parser => }/unreachable/postfix_pass.out | 0 tests/test-framework/src/runner.rs | 5 ++--- 548 files changed, 2 insertions(+), 3 deletions(-) rename tests/expectations/compiler/{compiler => }/address/binary.out (100%) rename tests/expectations/compiler/{compiler => }/address/branch.out (100%) rename tests/expectations/compiler/{compiler => }/address/equal.out (100%) rename tests/expectations/compiler/{compiler => }/address/gt_fail.out (100%) rename tests/expectations/compiler/{compiler => }/address/gte_fail.out (100%) rename tests/expectations/compiler/{compiler => }/address/lt_fail.out (100%) rename tests/expectations/compiler/{compiler => }/address/lte_fail.out (100%) rename tests/expectations/compiler/{compiler => }/address/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/boolean/and.out (100%) rename tests/expectations/compiler/{compiler => }/boolean/conditional.out (100%) rename tests/expectations/compiler/{compiler => }/boolean/equal.out (100%) rename tests/expectations/compiler/{compiler => }/boolean/not_equal.out (100%) rename tests/expectations/compiler/{compiler => }/boolean/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/boolean/or.out (100%) rename tests/expectations/compiler/{compiler => }/char/invalid_char.out (100%) rename tests/expectations/compiler/{compiler => }/char/neq.out (100%) rename tests/expectations/compiler/{compiler => }/char/out.out (100%) rename tests/expectations/compiler/{compiler => }/char/string.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/circuit_function_namespace_conflict_fail.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/duplicate_circuit_variable.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/duplicate_name_context.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/inline.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/inline_fail.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/inline_member_fail.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/inline_member_pass.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/inline_undefined.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/member_variable.out (100%) rename tests/expectations/compiler/{compiler => }/circuits/member_variable_fail.out (100%) rename tests/expectations/compiler/{compiler => }/console/assert.out (100%) rename tests/expectations/compiler/{compiler => }/console/conditional_assert.out (100%) rename tests/expectations/compiler/{compiler => }/console/error.out (100%) rename tests/expectations/compiler/{compiler => }/console/log.out (100%) rename tests/expectations/compiler/{compiler => }/console/log_conditional.out (100%) rename tests/expectations/compiler/{compiler => }/console/log_fail.out (100%) rename tests/expectations/compiler/{compiler => }/console/log_input.out (100%) rename tests/expectations/compiler/{compiler => }/console/log_parameter.out (100%) rename tests/expectations/compiler/{compiler => }/console/log_parameter_many.out (100%) rename tests/expectations/compiler/{compiler => }/console/log_parameter_unkown_fail.out (100%) rename tests/expectations/compiler/{compiler => }/console/log_string.out (100%) rename tests/expectations/compiler/{compiler => }/core/algorithms/bhp.out (100%) rename tests/expectations/compiler/{compiler => }/core/algorithms/pedersen.out (100%) rename tests/expectations/compiler/{compiler => }/core/algorithms/pedersen_fail.out (100%) rename tests/expectations/compiler/{compiler => }/core/algorithms/poseidon.out (100%) rename tests/expectations/compiler/{compiler => }/definition/out_of_order.out (100%) rename tests/expectations/compiler/{compiler => }/definition/use_decl_variable_as_assign_fail.out (100%) rename tests/expectations/compiler/{compiler => }/field/add.out (100%) rename tests/expectations/compiler/{compiler => }/field/div.out (100%) rename tests/expectations/compiler/{compiler => }/field/eq.out (100%) rename tests/expectations/compiler/{compiler => }/field/field.out (100%) rename tests/expectations/compiler/{compiler => }/field/mul.out (100%) rename tests/expectations/compiler/{compiler => }/field/negate.out (100%) rename tests/expectations/compiler/{compiler => }/field/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/field/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/field/pow.out (100%) rename tests/expectations/compiler/{compiler => }/field/sub.out (100%) rename tests/expectations/compiler/{compiler => }/field/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/function/conditional_return.out (100%) rename tests/expectations/compiler/{compiler => }/function/duplicate_definition_fail.out (100%) rename tests/expectations/compiler/{compiler => }/function/duplicate_parameter_fail.out (100%) rename tests/expectations/compiler/{compiler => }/function/iteration.out (100%) rename tests/expectations/compiler/{compiler => }/function/iteration_repeated.out (100%) rename tests/expectations/compiler/{compiler => }/function/no_return_fail.out (100%) rename tests/expectations/compiler/{compiler => }/function/repeated.out (100%) rename tests/expectations/compiler/{compiler => }/function/return.out (100%) rename tests/expectations/compiler/{compiler => }/function/scope_fail.out (100%) rename tests/expectations/compiler/{compiler => }/function/shadow_function_with_input_fail.out (100%) rename tests/expectations/compiler/{compiler => }/function/shadow_parameter_fail.out (100%) rename tests/expectations/compiler/{compiler => }/function/undefined_fail.out (100%) rename tests/expectations/compiler/{compiler => }/group/add.out (100%) rename tests/expectations/compiler/{compiler => }/group/assert_eq.out (100%) rename tests/expectations/compiler/{compiler => }/group/both_sign_high.out (100%) rename tests/expectations/compiler/{compiler => }/group/both_sign_inferred.out (100%) rename tests/expectations/compiler/{compiler => }/group/both_sign_low.out (100%) rename tests/expectations/compiler/{compiler => }/group/eq.out (100%) rename tests/expectations/compiler/{compiler => }/group/input.out (100%) rename tests/expectations/compiler/{compiler => }/group/mult_by_group_fail.out (100%) rename tests/expectations/compiler/{compiler => }/group/mult_by_scalar.out (100%) rename tests/expectations/compiler/{compiler => }/group/negate.out (100%) rename tests/expectations/compiler/{compiler => }/group/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/group/one.out (100%) rename tests/expectations/compiler/{compiler => }/group/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/group/point.out (100%) rename tests/expectations/compiler/{compiler => }/group/point_input.out (100%) rename tests/expectations/compiler/{compiler => }/group/positive_and_negative.out (100%) rename tests/expectations/compiler/{compiler => }/group/sub.out (100%) rename tests/expectations/compiler/{compiler => }/group/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/group/x_and_y.out (100%) rename tests/expectations/compiler/{compiler => }/group/x_sign_high.out (100%) rename tests/expectations/compiler/{compiler => }/group/x_sign_inferred.out (100%) rename tests/expectations/compiler/{compiler => }/group/x_sign_low.out (100%) rename tests/expectations/compiler/{compiler => }/group/y_sign_high.out (100%) rename tests/expectations/compiler/{compiler => }/group/y_sign_inferred.out (100%) rename tests/expectations/compiler/{compiler => }/group/y_sign_low.out (100%) rename tests/expectations/compiler/{compiler => }/group/zero.out (100%) rename tests/expectations/compiler/{compiler => }/input_files/program_input/main.out (100%) rename tests/expectations/compiler/{compiler => }/input_files/program_input/main_field.out (100%) rename tests/expectations/compiler/{compiler => }/input_files/program_input/main_group.out (100%) rename tests/expectations/compiler/{compiler => }/input_files/program_input_constants/main.out (100%) rename tests/expectations/compiler/{compiler => }/input_files/program_input_constants/main_field.out (100%) rename tests/expectations/compiler/{compiler => }/input_files/program_input_constants/main_group.out (100%) rename tests/expectations/compiler/{compiler => }/input_files/program_input_constants/main_multiple.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/negate.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/negate_min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/negate_zero.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i128/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/negate.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/negate_min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/negate_zero.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i16/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/negate.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/negate_min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/negate_zero.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i32/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/negate.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/negate_min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/negate_zero.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i64/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/negate.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/negate_min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/negate_zero.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/i8/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u128/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u16/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u32/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u64/xor.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/add.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/and.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/console_assert.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/div.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/eq.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/ge.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/gt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/le.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/lt.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/max.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/max_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/min.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/min_fail.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/mul.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/ne.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/or.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/pow.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/shl.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/shr.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/sub.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/integers/u8/xor.out (100%) rename tests/expectations/compiler/{compiler => }/mutability/cond_mut.out (100%) rename tests/expectations/compiler/{compiler => }/mutability/function_input_mut.out (100%) rename tests/expectations/compiler/{compiler => }/mutability/let_mut_nested.out (100%) rename tests/expectations/compiler/{compiler => }/records/balance_wrong_ty.out (100%) rename tests/expectations/compiler/{compiler => }/records/declaration.out (100%) rename tests/expectations/compiler/{compiler => }/records/duplicate_circuit_name_fail.out (100%) rename tests/expectations/compiler/{compiler => }/records/duplicate_var_fail.out (100%) rename tests/expectations/compiler/{compiler => }/records/init_expression.out (100%) rename tests/expectations/compiler/{compiler => }/records/init_expression_shorthand.out (100%) rename tests/expectations/compiler/{compiler => }/records/init_expression_type_fail.out (100%) rename tests/expectations/compiler/{compiler => }/records/init_expression_var_fail.out (100%) rename tests/expectations/compiler/{compiler => }/records/no_owner_fail.out (100%) rename tests/expectations/compiler/{compiler => }/records/owner_wrong_ty.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/add.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/cmp.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/div.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/eq.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/group_mul.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/mul.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/no_space_between_literal.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/operator_methods.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/scalar.out (100%) rename tests/expectations/compiler/{compiler => }/scalar/ternary.out (100%) rename tests/expectations/compiler/{compiler => }/statements/all_loops.out (100%) rename tests/expectations/compiler/{compiler => }/statements/all_loops_fail.out (100%) rename tests/expectations/compiler/{compiler => }/statements/assign_fail.out (100%) rename tests/expectations/compiler/{compiler => }/statements/assign_ternary.out (100%) rename tests/expectations/compiler/{compiler => }/statements/block.out (100%) rename tests/expectations/compiler/{compiler => }/statements/chain.out (100%) rename tests/expectations/compiler/{compiler => }/statements/compare_diff_types_fail.out (100%) rename tests/expectations/compiler/{compiler => }/statements/compare_invalid_negates_fail.out (100%) rename tests/expectations/compiler/{compiler => }/statements/duplicate_variable.out (100%) rename tests/expectations/compiler/{compiler => }/statements/for_loop.out (100%) rename tests/expectations/compiler/{compiler => }/statements/iteration_basic.out (100%) rename tests/expectations/compiler/{compiler => }/statements/iteration_variable.out (100%) rename tests/expectations/compiler/{compiler => }/statements/multiple_returns.out (100%) rename tests/expectations/compiler/{compiler => }/statements/mutate.out (100%) rename tests/expectations/compiler/{compiler => }/statements/non_existant_var_exp_fail.out (100%) rename tests/expectations/compiler/{compiler => }/statements/non_existant_vars_mul_fail.out (100%) rename tests/expectations/compiler/{compiler => }/statements/ternary_explicit_and_implicit.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/access.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/access_negative_fail.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/access_out_of_bounds_fail.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/declare_fail.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/function_return.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/function_return_single_fail.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/function_return_zero_fail.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/return_statement_fail.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/tuple_not_allowed.out (100%) rename tests/expectations/compiler/{compiler => }/tuple/type_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/access/call.out (100%) rename tests/expectations/parser/{parser => }/expression/array_init_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/array_inline_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/add.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/add_wrapped.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/and.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/bit_and.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/bit_or.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/bit_xor.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/div.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/div_wrapped.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/eq.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/eq_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/ge.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/ge_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/gt.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/gt_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/le.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/le_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/lt.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/lt_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/mul.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/mul_wrapped.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/nand.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/neq.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/neq_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/nor.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/or.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/pow.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/pow_wrapped.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/shl.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/shl_wrapped.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/shr.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/shr_wrapped.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/sub.out (100%) rename tests/expectations/parser/{parser => }/expression/binary/sub_wrapped.out (100%) rename tests/expectations/parser/{parser => }/expression/circuit_init_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/ident.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/address.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/address_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/address_parse.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/bool.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/bool_parse.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/char.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/char_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/char_parse.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/comment.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/comment_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/formatted_string.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/group.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/group_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/field.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/field_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/i128.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/i16.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/i32.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/i64.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/i8.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/implicit.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/mono_group.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/scalar.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/u128.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/u16.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/u32.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/u64.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/int_parse/u8.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/postfix_types.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/string.out (100%) rename tests/expectations/parser/{parser => }/expression/literal/string_fail.out (100%) rename tests/expectations/parser/{parser => }/expression/ternary.out (100%) rename tests/expectations/parser/{parser => }/expression/token_format.out (100%) rename tests/expectations/parser/{parser => }/expression/unary/abs.out (100%) rename tests/expectations/parser/{parser => }/expression/unary/abs_wrapped.out (100%) rename tests/expectations/parser/{parser => }/expression/unary/double.out (100%) rename tests/expectations/parser/{parser => }/expression/unary/inv.out (100%) rename tests/expectations/parser/{parser => }/expression/unary/neg.out (100%) rename tests/expectations/parser/{parser => }/expression/unary/not.out (100%) rename tests/expectations/parser/{parser => }/expression/unary/sqrt.out (100%) rename tests/expectations/parser/{parser => }/expression/unary/square.out (100%) rename tests/expectations/parser/{parser => }/functions/annotated_arg_not_ident.out (100%) rename tests/expectations/parser/{parser => }/functions/annotated_context_fail.out (100%) rename tests/expectations/parser/{parser => }/functions/bounded_recursion.out (100%) rename tests/expectations/parser/{parser => }/functions/const_input.out (100%) rename tests/expectations/parser/{parser => }/functions/const_param.out (100%) rename tests/expectations/parser/{parser => }/functions/const_public_param_fail.out (100%) rename tests/expectations/parser/{parser => }/functions/empty2.out (100%) rename tests/expectations/parser/{parser => }/functions/escape_fail.out (100%) rename tests/expectations/parser/{parser => }/functions/ident_token_fail.out (100%) rename tests/expectations/parser/{parser => }/functions/infinite_recursion.out (100%) rename tests/expectations/parser/{parser => }/functions/mut_input_fail.out (100%) rename tests/expectations/parser/{parser => }/functions/params.out (100%) rename tests/expectations/parser/{parser => }/functions/params_return.out (100%) rename tests/expectations/parser/{parser => }/functions/public_const_param_fail.out (100%) rename tests/expectations/parser/{parser => }/functions/public_param.out (100%) rename tests/expectations/parser/{parser => }/functions/return.out (100%) rename tests/expectations/parser/{parser => }/functions/test_keyword_fail.out (100%) rename tests/expectations/parser/{parser => }/inputs/input_const.out (100%) rename tests/expectations/parser/{parser => }/inputs/input_constant.out (100%) rename tests/expectations/parser/{parser => }/inputs/input_constant_public_fail.out (100%) rename tests/expectations/parser/{parser => }/inputs/input_fail.out (100%) rename tests/expectations/parser/{parser => }/inputs/input_public.out (100%) rename tests/expectations/parser/{parser => }/inputs/input_public_constant_fail.out (100%) rename tests/expectations/parser/{parser => }/program/backslash_eof.out (100%) rename tests/expectations/parser/{parser => }/program/bidi_comment_2_fail.out (100%) rename tests/expectations/parser/{parser => }/program/bidi_comment_fail.out (100%) rename tests/expectations/parser/{parser => }/program/dollar_eof.out (100%) rename tests/expectations/parser/{parser => }/program/escape_u8_eof.out (100%) rename tests/expectations/parser/{parser => }/program/hex_eof.out (100%) rename tests/expectations/parser/{parser => }/program/pipe_eof.out (100%) rename tests/expectations/parser/{parser => }/program/q_eof.out (100%) rename tests/expectations/parser/{parser => }/program/sq_eof.out (100%) rename tests/expectations/parser/{parser => }/program/tilde_eof.out (100%) rename tests/expectations/parser/{parser => }/program/unclosed_unicode_eof_fail.out (100%) rename tests/expectations/parser/{parser => }/serialize/one_plus_one.out (100%) rename tests/expectations/parser/{parser => }/serialize/parser_error.out (100%) rename tests/expectations/parser/{parser => }/statement/assign.out (100%) rename tests/expectations/parser/{parser => }/statement/block.out (100%) rename tests/expectations/parser/{parser => }/statement/conditional.out (100%) rename tests/expectations/parser/{parser => }/statement/conditional_fail.out (100%) rename tests/expectations/parser/{parser => }/statement/console.out (100%) rename tests/expectations/parser/{parser => }/statement/console_fail.out (100%) rename tests/expectations/parser/{parser => }/statement/definition.out (100%) rename tests/expectations/parser/{parser => }/statement/definition_fail.out (100%) rename tests/expectations/parser/{parser => }/statement/expression.out (100%) rename tests/expectations/parser/{parser => }/statement/expression_fail.out (100%) rename tests/expectations/parser/{parser => }/statement/hex_int_fail.out (100%) rename tests/expectations/parser/{parser => }/statement/iteration.out (100%) rename tests/expectations/parser/{parser => }/statement/let_mut_recover.out (100%) rename tests/expectations/parser/{parser => }/statement/return.out (100%) rename tests/expectations/parser/{parser => }/statement/return_fail.out (100%) rename tests/expectations/parser/{parser => }/unreachable/define.out (100%) rename tests/expectations/parser/{parser => }/unreachable/eat_ident.out (100%) rename tests/expectations/parser/{parser => }/unreachable/eat_int.out (100%) rename tests/expectations/parser/{parser => }/unreachable/equality_and_order_expression.out (100%) rename tests/expectations/parser/{parser => }/unreachable/expect_ident.out (100%) rename tests/expectations/parser/{parser => }/unreachable/math_op_fail.out (100%) rename tests/expectations/parser/{parser => }/unreachable/math_op_pass.out (100%) rename tests/expectations/parser/{parser => }/unreachable/postfix_fail.out (100%) rename tests/expectations/parser/{parser => }/unreachable/postfix_pass.out (100%) diff --git a/tests/expectations/compiler/compiler/address/binary.out b/tests/expectations/compiler/address/binary.out similarity index 100% rename from tests/expectations/compiler/compiler/address/binary.out rename to tests/expectations/compiler/address/binary.out diff --git a/tests/expectations/compiler/compiler/address/branch.out b/tests/expectations/compiler/address/branch.out similarity index 100% rename from tests/expectations/compiler/compiler/address/branch.out rename to tests/expectations/compiler/address/branch.out diff --git a/tests/expectations/compiler/compiler/address/equal.out b/tests/expectations/compiler/address/equal.out similarity index 100% rename from tests/expectations/compiler/compiler/address/equal.out rename to tests/expectations/compiler/address/equal.out diff --git a/tests/expectations/compiler/compiler/address/gt_fail.out b/tests/expectations/compiler/address/gt_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/address/gt_fail.out rename to tests/expectations/compiler/address/gt_fail.out diff --git a/tests/expectations/compiler/compiler/address/gte_fail.out b/tests/expectations/compiler/address/gte_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/address/gte_fail.out rename to tests/expectations/compiler/address/gte_fail.out diff --git a/tests/expectations/compiler/compiler/address/lt_fail.out b/tests/expectations/compiler/address/lt_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/address/lt_fail.out rename to tests/expectations/compiler/address/lt_fail.out diff --git a/tests/expectations/compiler/compiler/address/lte_fail.out b/tests/expectations/compiler/address/lte_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/address/lte_fail.out rename to tests/expectations/compiler/address/lte_fail.out diff --git a/tests/expectations/compiler/compiler/address/ternary.out b/tests/expectations/compiler/address/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/address/ternary.out rename to tests/expectations/compiler/address/ternary.out diff --git a/tests/expectations/compiler/compiler/boolean/and.out b/tests/expectations/compiler/boolean/and.out similarity index 100% rename from tests/expectations/compiler/compiler/boolean/and.out rename to tests/expectations/compiler/boolean/and.out diff --git a/tests/expectations/compiler/compiler/boolean/conditional.out b/tests/expectations/compiler/boolean/conditional.out similarity index 100% rename from tests/expectations/compiler/compiler/boolean/conditional.out rename to tests/expectations/compiler/boolean/conditional.out diff --git a/tests/expectations/compiler/compiler/boolean/equal.out b/tests/expectations/compiler/boolean/equal.out similarity index 100% rename from tests/expectations/compiler/compiler/boolean/equal.out rename to tests/expectations/compiler/boolean/equal.out diff --git a/tests/expectations/compiler/compiler/boolean/not_equal.out b/tests/expectations/compiler/boolean/not_equal.out similarity index 100% rename from tests/expectations/compiler/compiler/boolean/not_equal.out rename to tests/expectations/compiler/boolean/not_equal.out diff --git a/tests/expectations/compiler/compiler/boolean/operator_methods.out b/tests/expectations/compiler/boolean/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/boolean/operator_methods.out rename to tests/expectations/compiler/boolean/operator_methods.out diff --git a/tests/expectations/compiler/compiler/boolean/or.out b/tests/expectations/compiler/boolean/or.out similarity index 100% rename from tests/expectations/compiler/compiler/boolean/or.out rename to tests/expectations/compiler/boolean/or.out diff --git a/tests/expectations/compiler/compiler/char/invalid_char.out b/tests/expectations/compiler/char/invalid_char.out similarity index 100% rename from tests/expectations/compiler/compiler/char/invalid_char.out rename to tests/expectations/compiler/char/invalid_char.out diff --git a/tests/expectations/compiler/compiler/char/neq.out b/tests/expectations/compiler/char/neq.out similarity index 100% rename from tests/expectations/compiler/compiler/char/neq.out rename to tests/expectations/compiler/char/neq.out diff --git a/tests/expectations/compiler/compiler/char/out.out b/tests/expectations/compiler/char/out.out similarity index 100% rename from tests/expectations/compiler/compiler/char/out.out rename to tests/expectations/compiler/char/out.out diff --git a/tests/expectations/compiler/compiler/char/string.out b/tests/expectations/compiler/char/string.out similarity index 100% rename from tests/expectations/compiler/compiler/char/string.out rename to tests/expectations/compiler/char/string.out diff --git a/tests/expectations/compiler/compiler/circuits/circuit_function_namespace_conflict_fail.out b/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/circuit_function_namespace_conflict_fail.out rename to tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out diff --git a/tests/expectations/compiler/compiler/circuits/duplicate_circuit_variable.out b/tests/expectations/compiler/circuits/duplicate_circuit_variable.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/duplicate_circuit_variable.out rename to tests/expectations/compiler/circuits/duplicate_circuit_variable.out diff --git a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.out b/tests/expectations/compiler/circuits/duplicate_name_context.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/duplicate_name_context.out rename to tests/expectations/compiler/circuits/duplicate_name_context.out diff --git a/tests/expectations/compiler/compiler/circuits/inline.out b/tests/expectations/compiler/circuits/inline.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/inline.out rename to tests/expectations/compiler/circuits/inline.out diff --git a/tests/expectations/compiler/compiler/circuits/inline_fail.out b/tests/expectations/compiler/circuits/inline_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/inline_fail.out rename to tests/expectations/compiler/circuits/inline_fail.out diff --git a/tests/expectations/compiler/compiler/circuits/inline_member_fail.out b/tests/expectations/compiler/circuits/inline_member_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/inline_member_fail.out rename to tests/expectations/compiler/circuits/inline_member_fail.out diff --git a/tests/expectations/compiler/compiler/circuits/inline_member_pass.out b/tests/expectations/compiler/circuits/inline_member_pass.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/inline_member_pass.out rename to tests/expectations/compiler/circuits/inline_member_pass.out diff --git a/tests/expectations/compiler/compiler/circuits/inline_undefined.out b/tests/expectations/compiler/circuits/inline_undefined.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/inline_undefined.out rename to tests/expectations/compiler/circuits/inline_undefined.out diff --git a/tests/expectations/compiler/compiler/circuits/member_variable.out b/tests/expectations/compiler/circuits/member_variable.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/member_variable.out rename to tests/expectations/compiler/circuits/member_variable.out diff --git a/tests/expectations/compiler/compiler/circuits/member_variable_fail.out b/tests/expectations/compiler/circuits/member_variable_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/circuits/member_variable_fail.out rename to tests/expectations/compiler/circuits/member_variable_fail.out diff --git a/tests/expectations/compiler/compiler/console/assert.out b/tests/expectations/compiler/console/assert.out similarity index 100% rename from tests/expectations/compiler/compiler/console/assert.out rename to tests/expectations/compiler/console/assert.out diff --git a/tests/expectations/compiler/compiler/console/conditional_assert.out b/tests/expectations/compiler/console/conditional_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/console/conditional_assert.out rename to tests/expectations/compiler/console/conditional_assert.out diff --git a/tests/expectations/compiler/compiler/console/error.out b/tests/expectations/compiler/console/error.out similarity index 100% rename from tests/expectations/compiler/compiler/console/error.out rename to tests/expectations/compiler/console/error.out diff --git a/tests/expectations/compiler/compiler/console/log.out b/tests/expectations/compiler/console/log.out similarity index 100% rename from tests/expectations/compiler/compiler/console/log.out rename to tests/expectations/compiler/console/log.out diff --git a/tests/expectations/compiler/compiler/console/log_conditional.out b/tests/expectations/compiler/console/log_conditional.out similarity index 100% rename from tests/expectations/compiler/compiler/console/log_conditional.out rename to tests/expectations/compiler/console/log_conditional.out diff --git a/tests/expectations/compiler/compiler/console/log_fail.out b/tests/expectations/compiler/console/log_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/console/log_fail.out rename to tests/expectations/compiler/console/log_fail.out diff --git a/tests/expectations/compiler/compiler/console/log_input.out b/tests/expectations/compiler/console/log_input.out similarity index 100% rename from tests/expectations/compiler/compiler/console/log_input.out rename to tests/expectations/compiler/console/log_input.out diff --git a/tests/expectations/compiler/compiler/console/log_parameter.out b/tests/expectations/compiler/console/log_parameter.out similarity index 100% rename from tests/expectations/compiler/compiler/console/log_parameter.out rename to tests/expectations/compiler/console/log_parameter.out diff --git a/tests/expectations/compiler/compiler/console/log_parameter_many.out b/tests/expectations/compiler/console/log_parameter_many.out similarity index 100% rename from tests/expectations/compiler/compiler/console/log_parameter_many.out rename to tests/expectations/compiler/console/log_parameter_many.out diff --git a/tests/expectations/compiler/compiler/console/log_parameter_unkown_fail.out b/tests/expectations/compiler/console/log_parameter_unkown_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/console/log_parameter_unkown_fail.out rename to tests/expectations/compiler/console/log_parameter_unkown_fail.out diff --git a/tests/expectations/compiler/compiler/console/log_string.out b/tests/expectations/compiler/console/log_string.out similarity index 100% rename from tests/expectations/compiler/compiler/console/log_string.out rename to tests/expectations/compiler/console/log_string.out diff --git a/tests/expectations/compiler/compiler/core/algorithms/bhp.out b/tests/expectations/compiler/core/algorithms/bhp.out similarity index 100% rename from tests/expectations/compiler/compiler/core/algorithms/bhp.out rename to tests/expectations/compiler/core/algorithms/bhp.out diff --git a/tests/expectations/compiler/compiler/core/algorithms/pedersen.out b/tests/expectations/compiler/core/algorithms/pedersen.out similarity index 100% rename from tests/expectations/compiler/compiler/core/algorithms/pedersen.out rename to tests/expectations/compiler/core/algorithms/pedersen.out diff --git a/tests/expectations/compiler/compiler/core/algorithms/pedersen_fail.out b/tests/expectations/compiler/core/algorithms/pedersen_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/core/algorithms/pedersen_fail.out rename to tests/expectations/compiler/core/algorithms/pedersen_fail.out diff --git a/tests/expectations/compiler/compiler/core/algorithms/poseidon.out b/tests/expectations/compiler/core/algorithms/poseidon.out similarity index 100% rename from tests/expectations/compiler/compiler/core/algorithms/poseidon.out rename to tests/expectations/compiler/core/algorithms/poseidon.out diff --git a/tests/expectations/compiler/compiler/definition/out_of_order.out b/tests/expectations/compiler/definition/out_of_order.out similarity index 100% rename from tests/expectations/compiler/compiler/definition/out_of_order.out rename to tests/expectations/compiler/definition/out_of_order.out diff --git a/tests/expectations/compiler/compiler/definition/use_decl_variable_as_assign_fail.out b/tests/expectations/compiler/definition/use_decl_variable_as_assign_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/definition/use_decl_variable_as_assign_fail.out rename to tests/expectations/compiler/definition/use_decl_variable_as_assign_fail.out diff --git a/tests/expectations/compiler/compiler/field/add.out b/tests/expectations/compiler/field/add.out similarity index 100% rename from tests/expectations/compiler/compiler/field/add.out rename to tests/expectations/compiler/field/add.out diff --git a/tests/expectations/compiler/compiler/field/div.out b/tests/expectations/compiler/field/div.out similarity index 100% rename from tests/expectations/compiler/compiler/field/div.out rename to tests/expectations/compiler/field/div.out diff --git a/tests/expectations/compiler/compiler/field/eq.out b/tests/expectations/compiler/field/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/field/eq.out rename to tests/expectations/compiler/field/eq.out diff --git a/tests/expectations/compiler/compiler/field/field.out b/tests/expectations/compiler/field/field.out similarity index 100% rename from tests/expectations/compiler/compiler/field/field.out rename to tests/expectations/compiler/field/field.out diff --git a/tests/expectations/compiler/compiler/field/mul.out b/tests/expectations/compiler/field/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/field/mul.out rename to tests/expectations/compiler/field/mul.out diff --git a/tests/expectations/compiler/compiler/field/negate.out b/tests/expectations/compiler/field/negate.out similarity index 100% rename from tests/expectations/compiler/compiler/field/negate.out rename to tests/expectations/compiler/field/negate.out diff --git a/tests/expectations/compiler/compiler/field/no_space_between_literal.out b/tests/expectations/compiler/field/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/field/no_space_between_literal.out rename to tests/expectations/compiler/field/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/field/operator_methods.out b/tests/expectations/compiler/field/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/field/operator_methods.out rename to tests/expectations/compiler/field/operator_methods.out diff --git a/tests/expectations/compiler/compiler/field/pow.out b/tests/expectations/compiler/field/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/field/pow.out rename to tests/expectations/compiler/field/pow.out diff --git a/tests/expectations/compiler/compiler/field/sub.out b/tests/expectations/compiler/field/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/field/sub.out rename to tests/expectations/compiler/field/sub.out diff --git a/tests/expectations/compiler/compiler/field/ternary.out b/tests/expectations/compiler/field/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/field/ternary.out rename to tests/expectations/compiler/field/ternary.out diff --git a/tests/expectations/compiler/compiler/function/conditional_return.out b/tests/expectations/compiler/function/conditional_return.out similarity index 100% rename from tests/expectations/compiler/compiler/function/conditional_return.out rename to tests/expectations/compiler/function/conditional_return.out diff --git a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.out b/tests/expectations/compiler/function/duplicate_definition_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/function/duplicate_definition_fail.out rename to tests/expectations/compiler/function/duplicate_definition_fail.out diff --git a/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.out b/tests/expectations/compiler/function/duplicate_parameter_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/function/duplicate_parameter_fail.out rename to tests/expectations/compiler/function/duplicate_parameter_fail.out diff --git a/tests/expectations/compiler/compiler/function/iteration.out b/tests/expectations/compiler/function/iteration.out similarity index 100% rename from tests/expectations/compiler/compiler/function/iteration.out rename to tests/expectations/compiler/function/iteration.out diff --git a/tests/expectations/compiler/compiler/function/iteration_repeated.out b/tests/expectations/compiler/function/iteration_repeated.out similarity index 100% rename from tests/expectations/compiler/compiler/function/iteration_repeated.out rename to tests/expectations/compiler/function/iteration_repeated.out diff --git a/tests/expectations/compiler/compiler/function/no_return_fail.out b/tests/expectations/compiler/function/no_return_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/function/no_return_fail.out rename to tests/expectations/compiler/function/no_return_fail.out diff --git a/tests/expectations/compiler/compiler/function/repeated.out b/tests/expectations/compiler/function/repeated.out similarity index 100% rename from tests/expectations/compiler/compiler/function/repeated.out rename to tests/expectations/compiler/function/repeated.out diff --git a/tests/expectations/compiler/compiler/function/return.out b/tests/expectations/compiler/function/return.out similarity index 100% rename from tests/expectations/compiler/compiler/function/return.out rename to tests/expectations/compiler/function/return.out diff --git a/tests/expectations/compiler/compiler/function/scope_fail.out b/tests/expectations/compiler/function/scope_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/function/scope_fail.out rename to tests/expectations/compiler/function/scope_fail.out diff --git a/tests/expectations/compiler/compiler/function/shadow_function_with_input_fail.out b/tests/expectations/compiler/function/shadow_function_with_input_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/function/shadow_function_with_input_fail.out rename to tests/expectations/compiler/function/shadow_function_with_input_fail.out diff --git a/tests/expectations/compiler/compiler/function/shadow_parameter_fail.out b/tests/expectations/compiler/function/shadow_parameter_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/function/shadow_parameter_fail.out rename to tests/expectations/compiler/function/shadow_parameter_fail.out diff --git a/tests/expectations/compiler/compiler/function/undefined_fail.out b/tests/expectations/compiler/function/undefined_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/function/undefined_fail.out rename to tests/expectations/compiler/function/undefined_fail.out diff --git a/tests/expectations/compiler/compiler/group/add.out b/tests/expectations/compiler/group/add.out similarity index 100% rename from tests/expectations/compiler/compiler/group/add.out rename to tests/expectations/compiler/group/add.out diff --git a/tests/expectations/compiler/compiler/group/assert_eq.out b/tests/expectations/compiler/group/assert_eq.out similarity index 100% rename from tests/expectations/compiler/compiler/group/assert_eq.out rename to tests/expectations/compiler/group/assert_eq.out diff --git a/tests/expectations/compiler/compiler/group/both_sign_high.out b/tests/expectations/compiler/group/both_sign_high.out similarity index 100% rename from tests/expectations/compiler/compiler/group/both_sign_high.out rename to tests/expectations/compiler/group/both_sign_high.out diff --git a/tests/expectations/compiler/compiler/group/both_sign_inferred.out b/tests/expectations/compiler/group/both_sign_inferred.out similarity index 100% rename from tests/expectations/compiler/compiler/group/both_sign_inferred.out rename to tests/expectations/compiler/group/both_sign_inferred.out diff --git a/tests/expectations/compiler/compiler/group/both_sign_low.out b/tests/expectations/compiler/group/both_sign_low.out similarity index 100% rename from tests/expectations/compiler/compiler/group/both_sign_low.out rename to tests/expectations/compiler/group/both_sign_low.out diff --git a/tests/expectations/compiler/compiler/group/eq.out b/tests/expectations/compiler/group/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/group/eq.out rename to tests/expectations/compiler/group/eq.out diff --git a/tests/expectations/compiler/compiler/group/input.out b/tests/expectations/compiler/group/input.out similarity index 100% rename from tests/expectations/compiler/compiler/group/input.out rename to tests/expectations/compiler/group/input.out diff --git a/tests/expectations/compiler/compiler/group/mult_by_group_fail.out b/tests/expectations/compiler/group/mult_by_group_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/group/mult_by_group_fail.out rename to tests/expectations/compiler/group/mult_by_group_fail.out diff --git a/tests/expectations/compiler/compiler/group/mult_by_scalar.out b/tests/expectations/compiler/group/mult_by_scalar.out similarity index 100% rename from tests/expectations/compiler/compiler/group/mult_by_scalar.out rename to tests/expectations/compiler/group/mult_by_scalar.out diff --git a/tests/expectations/compiler/compiler/group/negate.out b/tests/expectations/compiler/group/negate.out similarity index 100% rename from tests/expectations/compiler/compiler/group/negate.out rename to tests/expectations/compiler/group/negate.out diff --git a/tests/expectations/compiler/compiler/group/no_space_between_literal.out b/tests/expectations/compiler/group/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/group/no_space_between_literal.out rename to tests/expectations/compiler/group/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/group/one.out b/tests/expectations/compiler/group/one.out similarity index 100% rename from tests/expectations/compiler/compiler/group/one.out rename to tests/expectations/compiler/group/one.out diff --git a/tests/expectations/compiler/compiler/group/operator_methods.out b/tests/expectations/compiler/group/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/group/operator_methods.out rename to tests/expectations/compiler/group/operator_methods.out diff --git a/tests/expectations/compiler/compiler/group/point.out b/tests/expectations/compiler/group/point.out similarity index 100% rename from tests/expectations/compiler/compiler/group/point.out rename to tests/expectations/compiler/group/point.out diff --git a/tests/expectations/compiler/compiler/group/point_input.out b/tests/expectations/compiler/group/point_input.out similarity index 100% rename from tests/expectations/compiler/compiler/group/point_input.out rename to tests/expectations/compiler/group/point_input.out diff --git a/tests/expectations/compiler/compiler/group/positive_and_negative.out b/tests/expectations/compiler/group/positive_and_negative.out similarity index 100% rename from tests/expectations/compiler/compiler/group/positive_and_negative.out rename to tests/expectations/compiler/group/positive_and_negative.out diff --git a/tests/expectations/compiler/compiler/group/sub.out b/tests/expectations/compiler/group/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/group/sub.out rename to tests/expectations/compiler/group/sub.out diff --git a/tests/expectations/compiler/compiler/group/ternary.out b/tests/expectations/compiler/group/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/group/ternary.out rename to tests/expectations/compiler/group/ternary.out diff --git a/tests/expectations/compiler/compiler/group/x_and_y.out b/tests/expectations/compiler/group/x_and_y.out similarity index 100% rename from tests/expectations/compiler/compiler/group/x_and_y.out rename to tests/expectations/compiler/group/x_and_y.out diff --git a/tests/expectations/compiler/compiler/group/x_sign_high.out b/tests/expectations/compiler/group/x_sign_high.out similarity index 100% rename from tests/expectations/compiler/compiler/group/x_sign_high.out rename to tests/expectations/compiler/group/x_sign_high.out diff --git a/tests/expectations/compiler/compiler/group/x_sign_inferred.out b/tests/expectations/compiler/group/x_sign_inferred.out similarity index 100% rename from tests/expectations/compiler/compiler/group/x_sign_inferred.out rename to tests/expectations/compiler/group/x_sign_inferred.out diff --git a/tests/expectations/compiler/compiler/group/x_sign_low.out b/tests/expectations/compiler/group/x_sign_low.out similarity index 100% rename from tests/expectations/compiler/compiler/group/x_sign_low.out rename to tests/expectations/compiler/group/x_sign_low.out diff --git a/tests/expectations/compiler/compiler/group/y_sign_high.out b/tests/expectations/compiler/group/y_sign_high.out similarity index 100% rename from tests/expectations/compiler/compiler/group/y_sign_high.out rename to tests/expectations/compiler/group/y_sign_high.out diff --git a/tests/expectations/compiler/compiler/group/y_sign_inferred.out b/tests/expectations/compiler/group/y_sign_inferred.out similarity index 100% rename from tests/expectations/compiler/compiler/group/y_sign_inferred.out rename to tests/expectations/compiler/group/y_sign_inferred.out diff --git a/tests/expectations/compiler/compiler/group/y_sign_low.out b/tests/expectations/compiler/group/y_sign_low.out similarity index 100% rename from tests/expectations/compiler/compiler/group/y_sign_low.out rename to tests/expectations/compiler/group/y_sign_low.out diff --git a/tests/expectations/compiler/compiler/group/zero.out b/tests/expectations/compiler/group/zero.out similarity index 100% rename from tests/expectations/compiler/compiler/group/zero.out rename to tests/expectations/compiler/group/zero.out diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main.out b/tests/expectations/compiler/input_files/program_input/main.out similarity index 100% rename from tests/expectations/compiler/compiler/input_files/program_input/main.out rename to tests/expectations/compiler/input_files/program_input/main.out diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_field.out b/tests/expectations/compiler/input_files/program_input/main_field.out similarity index 100% rename from tests/expectations/compiler/compiler/input_files/program_input/main_field.out rename to tests/expectations/compiler/input_files/program_input/main_field.out diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_group.out b/tests/expectations/compiler/input_files/program_input/main_group.out similarity index 100% rename from tests/expectations/compiler/compiler/input_files/program_input/main_group.out rename to tests/expectations/compiler/input_files/program_input/main_group.out diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main.out b/tests/expectations/compiler/input_files/program_input_constants/main.out similarity index 100% rename from tests/expectations/compiler/compiler/input_files/program_input_constants/main.out rename to tests/expectations/compiler/input_files/program_input_constants/main.out diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.out b/tests/expectations/compiler/input_files/program_input_constants/main_field.out similarity index 100% rename from tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.out rename to tests/expectations/compiler/input_files/program_input_constants/main_field.out diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.out b/tests/expectations/compiler/input_files/program_input_constants/main_group.out similarity index 100% rename from tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.out rename to tests/expectations/compiler/input_files/program_input_constants/main_group.out diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.out b/tests/expectations/compiler/input_files/program_input_constants/main_multiple.out similarity index 100% rename from tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.out rename to tests/expectations/compiler/input_files/program_input_constants/main_multiple.out diff --git a/tests/expectations/compiler/compiler/integers/i128/add.out b/tests/expectations/compiler/integers/i128/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/add.out rename to tests/expectations/compiler/integers/i128/add.out diff --git a/tests/expectations/compiler/compiler/integers/i128/and.out b/tests/expectations/compiler/integers/i128/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/and.out rename to tests/expectations/compiler/integers/i128/and.out diff --git a/tests/expectations/compiler/compiler/integers/i128/console_assert.out b/tests/expectations/compiler/integers/i128/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/console_assert.out rename to tests/expectations/compiler/integers/i128/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/i128/div.out b/tests/expectations/compiler/integers/i128/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/div.out rename to tests/expectations/compiler/integers/i128/div.out diff --git a/tests/expectations/compiler/compiler/integers/i128/eq.out b/tests/expectations/compiler/integers/i128/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/eq.out rename to tests/expectations/compiler/integers/i128/eq.out diff --git a/tests/expectations/compiler/compiler/integers/i128/ge.out b/tests/expectations/compiler/integers/i128/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/ge.out rename to tests/expectations/compiler/integers/i128/ge.out diff --git a/tests/expectations/compiler/compiler/integers/i128/gt.out b/tests/expectations/compiler/integers/i128/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/gt.out rename to tests/expectations/compiler/integers/i128/gt.out diff --git a/tests/expectations/compiler/compiler/integers/i128/le.out b/tests/expectations/compiler/integers/i128/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/le.out rename to tests/expectations/compiler/integers/i128/le.out diff --git a/tests/expectations/compiler/compiler/integers/i128/lt.out b/tests/expectations/compiler/integers/i128/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/lt.out rename to tests/expectations/compiler/integers/i128/lt.out diff --git a/tests/expectations/compiler/compiler/integers/i128/max.out b/tests/expectations/compiler/integers/i128/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/max.out rename to tests/expectations/compiler/integers/i128/max.out diff --git a/tests/expectations/compiler/compiler/integers/i128/max_fail.out b/tests/expectations/compiler/integers/i128/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/max_fail.out rename to tests/expectations/compiler/integers/i128/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i128/min.out b/tests/expectations/compiler/integers/i128/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/min.out rename to tests/expectations/compiler/integers/i128/min.out diff --git a/tests/expectations/compiler/compiler/integers/i128/min_fail.out b/tests/expectations/compiler/integers/i128/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/min_fail.out rename to tests/expectations/compiler/integers/i128/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i128/mul.out b/tests/expectations/compiler/integers/i128/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/mul.out rename to tests/expectations/compiler/integers/i128/mul.out diff --git a/tests/expectations/compiler/compiler/integers/i128/ne.out b/tests/expectations/compiler/integers/i128/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/ne.out rename to tests/expectations/compiler/integers/i128/ne.out diff --git a/tests/expectations/compiler/compiler/integers/i128/negate.out b/tests/expectations/compiler/integers/i128/negate.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/negate.out rename to tests/expectations/compiler/integers/i128/negate.out diff --git a/tests/expectations/compiler/compiler/integers/i128/negate_min.out b/tests/expectations/compiler/integers/i128/negate_min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/negate_min.out rename to tests/expectations/compiler/integers/i128/negate_min.out diff --git a/tests/expectations/compiler/compiler/integers/i128/negate_zero.out b/tests/expectations/compiler/integers/i128/negate_zero.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/negate_zero.out rename to tests/expectations/compiler/integers/i128/negate_zero.out diff --git a/tests/expectations/compiler/compiler/integers/i128/no_space_between_literal.out b/tests/expectations/compiler/integers/i128/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/no_space_between_literal.out rename to tests/expectations/compiler/integers/i128/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/i128/operator_methods.out b/tests/expectations/compiler/integers/i128/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/operator_methods.out rename to tests/expectations/compiler/integers/i128/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/i128/or.out b/tests/expectations/compiler/integers/i128/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/or.out rename to tests/expectations/compiler/integers/i128/or.out diff --git a/tests/expectations/compiler/compiler/integers/i128/pow.out b/tests/expectations/compiler/integers/i128/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/pow.out rename to tests/expectations/compiler/integers/i128/pow.out diff --git a/tests/expectations/compiler/compiler/integers/i128/shl.out b/tests/expectations/compiler/integers/i128/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/shl.out rename to tests/expectations/compiler/integers/i128/shl.out diff --git a/tests/expectations/compiler/compiler/integers/i128/shr.out b/tests/expectations/compiler/integers/i128/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/shr.out rename to tests/expectations/compiler/integers/i128/shr.out diff --git a/tests/expectations/compiler/compiler/integers/i128/sub.out b/tests/expectations/compiler/integers/i128/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/sub.out rename to tests/expectations/compiler/integers/i128/sub.out diff --git a/tests/expectations/compiler/compiler/integers/i128/ternary.out b/tests/expectations/compiler/integers/i128/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/ternary.out rename to tests/expectations/compiler/integers/i128/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/i128/xor.out b/tests/expectations/compiler/integers/i128/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i128/xor.out rename to tests/expectations/compiler/integers/i128/xor.out diff --git a/tests/expectations/compiler/compiler/integers/i16/add.out b/tests/expectations/compiler/integers/i16/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/add.out rename to tests/expectations/compiler/integers/i16/add.out diff --git a/tests/expectations/compiler/compiler/integers/i16/and.out b/tests/expectations/compiler/integers/i16/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/and.out rename to tests/expectations/compiler/integers/i16/and.out diff --git a/tests/expectations/compiler/compiler/integers/i16/console_assert.out b/tests/expectations/compiler/integers/i16/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/console_assert.out rename to tests/expectations/compiler/integers/i16/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/i16/div.out b/tests/expectations/compiler/integers/i16/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/div.out rename to tests/expectations/compiler/integers/i16/div.out diff --git a/tests/expectations/compiler/compiler/integers/i16/eq.out b/tests/expectations/compiler/integers/i16/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/eq.out rename to tests/expectations/compiler/integers/i16/eq.out diff --git a/tests/expectations/compiler/compiler/integers/i16/ge.out b/tests/expectations/compiler/integers/i16/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/ge.out rename to tests/expectations/compiler/integers/i16/ge.out diff --git a/tests/expectations/compiler/compiler/integers/i16/gt.out b/tests/expectations/compiler/integers/i16/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/gt.out rename to tests/expectations/compiler/integers/i16/gt.out diff --git a/tests/expectations/compiler/compiler/integers/i16/le.out b/tests/expectations/compiler/integers/i16/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/le.out rename to tests/expectations/compiler/integers/i16/le.out diff --git a/tests/expectations/compiler/compiler/integers/i16/lt.out b/tests/expectations/compiler/integers/i16/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/lt.out rename to tests/expectations/compiler/integers/i16/lt.out diff --git a/tests/expectations/compiler/compiler/integers/i16/max.out b/tests/expectations/compiler/integers/i16/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/max.out rename to tests/expectations/compiler/integers/i16/max.out diff --git a/tests/expectations/compiler/compiler/integers/i16/max_fail.out b/tests/expectations/compiler/integers/i16/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/max_fail.out rename to tests/expectations/compiler/integers/i16/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i16/min.out b/tests/expectations/compiler/integers/i16/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/min.out rename to tests/expectations/compiler/integers/i16/min.out diff --git a/tests/expectations/compiler/compiler/integers/i16/min_fail.out b/tests/expectations/compiler/integers/i16/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/min_fail.out rename to tests/expectations/compiler/integers/i16/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i16/mul.out b/tests/expectations/compiler/integers/i16/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/mul.out rename to tests/expectations/compiler/integers/i16/mul.out diff --git a/tests/expectations/compiler/compiler/integers/i16/ne.out b/tests/expectations/compiler/integers/i16/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/ne.out rename to tests/expectations/compiler/integers/i16/ne.out diff --git a/tests/expectations/compiler/compiler/integers/i16/negate.out b/tests/expectations/compiler/integers/i16/negate.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/negate.out rename to tests/expectations/compiler/integers/i16/negate.out diff --git a/tests/expectations/compiler/compiler/integers/i16/negate_min_fail.out b/tests/expectations/compiler/integers/i16/negate_min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/negate_min_fail.out rename to tests/expectations/compiler/integers/i16/negate_min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i16/negate_zero.out b/tests/expectations/compiler/integers/i16/negate_zero.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/negate_zero.out rename to tests/expectations/compiler/integers/i16/negate_zero.out diff --git a/tests/expectations/compiler/compiler/integers/i16/no_space_between_literal.out b/tests/expectations/compiler/integers/i16/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/no_space_between_literal.out rename to tests/expectations/compiler/integers/i16/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/i16/operator_methods.out b/tests/expectations/compiler/integers/i16/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/operator_methods.out rename to tests/expectations/compiler/integers/i16/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/i16/or.out b/tests/expectations/compiler/integers/i16/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/or.out rename to tests/expectations/compiler/integers/i16/or.out diff --git a/tests/expectations/compiler/compiler/integers/i16/pow.out b/tests/expectations/compiler/integers/i16/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/pow.out rename to tests/expectations/compiler/integers/i16/pow.out diff --git a/tests/expectations/compiler/compiler/integers/i16/shl.out b/tests/expectations/compiler/integers/i16/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/shl.out rename to tests/expectations/compiler/integers/i16/shl.out diff --git a/tests/expectations/compiler/compiler/integers/i16/shr.out b/tests/expectations/compiler/integers/i16/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/shr.out rename to tests/expectations/compiler/integers/i16/shr.out diff --git a/tests/expectations/compiler/compiler/integers/i16/sub.out b/tests/expectations/compiler/integers/i16/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/sub.out rename to tests/expectations/compiler/integers/i16/sub.out diff --git a/tests/expectations/compiler/compiler/integers/i16/ternary.out b/tests/expectations/compiler/integers/i16/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/ternary.out rename to tests/expectations/compiler/integers/i16/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/i16/xor.out b/tests/expectations/compiler/integers/i16/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i16/xor.out rename to tests/expectations/compiler/integers/i16/xor.out diff --git a/tests/expectations/compiler/compiler/integers/i32/add.out b/tests/expectations/compiler/integers/i32/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/add.out rename to tests/expectations/compiler/integers/i32/add.out diff --git a/tests/expectations/compiler/compiler/integers/i32/and.out b/tests/expectations/compiler/integers/i32/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/and.out rename to tests/expectations/compiler/integers/i32/and.out diff --git a/tests/expectations/compiler/compiler/integers/i32/console_assert.out b/tests/expectations/compiler/integers/i32/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/console_assert.out rename to tests/expectations/compiler/integers/i32/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/i32/div.out b/tests/expectations/compiler/integers/i32/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/div.out rename to tests/expectations/compiler/integers/i32/div.out diff --git a/tests/expectations/compiler/compiler/integers/i32/eq.out b/tests/expectations/compiler/integers/i32/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/eq.out rename to tests/expectations/compiler/integers/i32/eq.out diff --git a/tests/expectations/compiler/compiler/integers/i32/ge.out b/tests/expectations/compiler/integers/i32/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/ge.out rename to tests/expectations/compiler/integers/i32/ge.out diff --git a/tests/expectations/compiler/compiler/integers/i32/gt.out b/tests/expectations/compiler/integers/i32/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/gt.out rename to tests/expectations/compiler/integers/i32/gt.out diff --git a/tests/expectations/compiler/compiler/integers/i32/le.out b/tests/expectations/compiler/integers/i32/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/le.out rename to tests/expectations/compiler/integers/i32/le.out diff --git a/tests/expectations/compiler/compiler/integers/i32/lt.out b/tests/expectations/compiler/integers/i32/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/lt.out rename to tests/expectations/compiler/integers/i32/lt.out diff --git a/tests/expectations/compiler/compiler/integers/i32/max.out b/tests/expectations/compiler/integers/i32/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/max.out rename to tests/expectations/compiler/integers/i32/max.out diff --git a/tests/expectations/compiler/compiler/integers/i32/max_fail.out b/tests/expectations/compiler/integers/i32/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/max_fail.out rename to tests/expectations/compiler/integers/i32/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i32/min.out b/tests/expectations/compiler/integers/i32/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/min.out rename to tests/expectations/compiler/integers/i32/min.out diff --git a/tests/expectations/compiler/compiler/integers/i32/min_fail.out b/tests/expectations/compiler/integers/i32/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/min_fail.out rename to tests/expectations/compiler/integers/i32/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i32/mul.out b/tests/expectations/compiler/integers/i32/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/mul.out rename to tests/expectations/compiler/integers/i32/mul.out diff --git a/tests/expectations/compiler/compiler/integers/i32/ne.out b/tests/expectations/compiler/integers/i32/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/ne.out rename to tests/expectations/compiler/integers/i32/ne.out diff --git a/tests/expectations/compiler/compiler/integers/i32/negate.out b/tests/expectations/compiler/integers/i32/negate.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/negate.out rename to tests/expectations/compiler/integers/i32/negate.out diff --git a/tests/expectations/compiler/compiler/integers/i32/negate_min.out b/tests/expectations/compiler/integers/i32/negate_min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/negate_min.out rename to tests/expectations/compiler/integers/i32/negate_min.out diff --git a/tests/expectations/compiler/compiler/integers/i32/negate_zero.out b/tests/expectations/compiler/integers/i32/negate_zero.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/negate_zero.out rename to tests/expectations/compiler/integers/i32/negate_zero.out diff --git a/tests/expectations/compiler/compiler/integers/i32/no_space_between_literal.out b/tests/expectations/compiler/integers/i32/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/no_space_between_literal.out rename to tests/expectations/compiler/integers/i32/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/i32/operator_methods.out b/tests/expectations/compiler/integers/i32/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/operator_methods.out rename to tests/expectations/compiler/integers/i32/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/i32/or.out b/tests/expectations/compiler/integers/i32/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/or.out rename to tests/expectations/compiler/integers/i32/or.out diff --git a/tests/expectations/compiler/compiler/integers/i32/pow.out b/tests/expectations/compiler/integers/i32/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/pow.out rename to tests/expectations/compiler/integers/i32/pow.out diff --git a/tests/expectations/compiler/compiler/integers/i32/shl.out b/tests/expectations/compiler/integers/i32/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/shl.out rename to tests/expectations/compiler/integers/i32/shl.out diff --git a/tests/expectations/compiler/compiler/integers/i32/shr.out b/tests/expectations/compiler/integers/i32/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/shr.out rename to tests/expectations/compiler/integers/i32/shr.out diff --git a/tests/expectations/compiler/compiler/integers/i32/sub.out b/tests/expectations/compiler/integers/i32/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/sub.out rename to tests/expectations/compiler/integers/i32/sub.out diff --git a/tests/expectations/compiler/compiler/integers/i32/ternary.out b/tests/expectations/compiler/integers/i32/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/ternary.out rename to tests/expectations/compiler/integers/i32/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/i32/xor.out b/tests/expectations/compiler/integers/i32/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i32/xor.out rename to tests/expectations/compiler/integers/i32/xor.out diff --git a/tests/expectations/compiler/compiler/integers/i64/add.out b/tests/expectations/compiler/integers/i64/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/add.out rename to tests/expectations/compiler/integers/i64/add.out diff --git a/tests/expectations/compiler/compiler/integers/i64/and.out b/tests/expectations/compiler/integers/i64/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/and.out rename to tests/expectations/compiler/integers/i64/and.out diff --git a/tests/expectations/compiler/compiler/integers/i64/console_assert.out b/tests/expectations/compiler/integers/i64/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/console_assert.out rename to tests/expectations/compiler/integers/i64/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/i64/div.out b/tests/expectations/compiler/integers/i64/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/div.out rename to tests/expectations/compiler/integers/i64/div.out diff --git a/tests/expectations/compiler/compiler/integers/i64/eq.out b/tests/expectations/compiler/integers/i64/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/eq.out rename to tests/expectations/compiler/integers/i64/eq.out diff --git a/tests/expectations/compiler/compiler/integers/i64/ge.out b/tests/expectations/compiler/integers/i64/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/ge.out rename to tests/expectations/compiler/integers/i64/ge.out diff --git a/tests/expectations/compiler/compiler/integers/i64/gt.out b/tests/expectations/compiler/integers/i64/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/gt.out rename to tests/expectations/compiler/integers/i64/gt.out diff --git a/tests/expectations/compiler/compiler/integers/i64/le.out b/tests/expectations/compiler/integers/i64/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/le.out rename to tests/expectations/compiler/integers/i64/le.out diff --git a/tests/expectations/compiler/compiler/integers/i64/lt.out b/tests/expectations/compiler/integers/i64/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/lt.out rename to tests/expectations/compiler/integers/i64/lt.out diff --git a/tests/expectations/compiler/compiler/integers/i64/max.out b/tests/expectations/compiler/integers/i64/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/max.out rename to tests/expectations/compiler/integers/i64/max.out diff --git a/tests/expectations/compiler/compiler/integers/i64/max_fail.out b/tests/expectations/compiler/integers/i64/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/max_fail.out rename to tests/expectations/compiler/integers/i64/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i64/min.out b/tests/expectations/compiler/integers/i64/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/min.out rename to tests/expectations/compiler/integers/i64/min.out diff --git a/tests/expectations/compiler/compiler/integers/i64/min_fail.out b/tests/expectations/compiler/integers/i64/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/min_fail.out rename to tests/expectations/compiler/integers/i64/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i64/mul.out b/tests/expectations/compiler/integers/i64/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/mul.out rename to tests/expectations/compiler/integers/i64/mul.out diff --git a/tests/expectations/compiler/compiler/integers/i64/ne.out b/tests/expectations/compiler/integers/i64/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/ne.out rename to tests/expectations/compiler/integers/i64/ne.out diff --git a/tests/expectations/compiler/compiler/integers/i64/negate.out b/tests/expectations/compiler/integers/i64/negate.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/negate.out rename to tests/expectations/compiler/integers/i64/negate.out diff --git a/tests/expectations/compiler/compiler/integers/i64/negate_min.out b/tests/expectations/compiler/integers/i64/negate_min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/negate_min.out rename to tests/expectations/compiler/integers/i64/negate_min.out diff --git a/tests/expectations/compiler/compiler/integers/i64/negate_zero.out b/tests/expectations/compiler/integers/i64/negate_zero.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/negate_zero.out rename to tests/expectations/compiler/integers/i64/negate_zero.out diff --git a/tests/expectations/compiler/compiler/integers/i64/no_space_between_literal.out b/tests/expectations/compiler/integers/i64/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/no_space_between_literal.out rename to tests/expectations/compiler/integers/i64/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/i64/operator_methods.out b/tests/expectations/compiler/integers/i64/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/operator_methods.out rename to tests/expectations/compiler/integers/i64/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/i64/or.out b/tests/expectations/compiler/integers/i64/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/or.out rename to tests/expectations/compiler/integers/i64/or.out diff --git a/tests/expectations/compiler/compiler/integers/i64/pow.out b/tests/expectations/compiler/integers/i64/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/pow.out rename to tests/expectations/compiler/integers/i64/pow.out diff --git a/tests/expectations/compiler/compiler/integers/i64/shl.out b/tests/expectations/compiler/integers/i64/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/shl.out rename to tests/expectations/compiler/integers/i64/shl.out diff --git a/tests/expectations/compiler/compiler/integers/i64/shr.out b/tests/expectations/compiler/integers/i64/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/shr.out rename to tests/expectations/compiler/integers/i64/shr.out diff --git a/tests/expectations/compiler/compiler/integers/i64/sub.out b/tests/expectations/compiler/integers/i64/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/sub.out rename to tests/expectations/compiler/integers/i64/sub.out diff --git a/tests/expectations/compiler/compiler/integers/i64/ternary.out b/tests/expectations/compiler/integers/i64/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/ternary.out rename to tests/expectations/compiler/integers/i64/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/i64/xor.out b/tests/expectations/compiler/integers/i64/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i64/xor.out rename to tests/expectations/compiler/integers/i64/xor.out diff --git a/tests/expectations/compiler/compiler/integers/i8/add.out b/tests/expectations/compiler/integers/i8/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/add.out rename to tests/expectations/compiler/integers/i8/add.out diff --git a/tests/expectations/compiler/compiler/integers/i8/and.out b/tests/expectations/compiler/integers/i8/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/and.out rename to tests/expectations/compiler/integers/i8/and.out diff --git a/tests/expectations/compiler/compiler/integers/i8/console_assert.out b/tests/expectations/compiler/integers/i8/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/console_assert.out rename to tests/expectations/compiler/integers/i8/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/i8/div.out b/tests/expectations/compiler/integers/i8/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/div.out rename to tests/expectations/compiler/integers/i8/div.out diff --git a/tests/expectations/compiler/compiler/integers/i8/eq.out b/tests/expectations/compiler/integers/i8/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/eq.out rename to tests/expectations/compiler/integers/i8/eq.out diff --git a/tests/expectations/compiler/compiler/integers/i8/ge.out b/tests/expectations/compiler/integers/i8/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/ge.out rename to tests/expectations/compiler/integers/i8/ge.out diff --git a/tests/expectations/compiler/compiler/integers/i8/gt.out b/tests/expectations/compiler/integers/i8/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/gt.out rename to tests/expectations/compiler/integers/i8/gt.out diff --git a/tests/expectations/compiler/compiler/integers/i8/le.out b/tests/expectations/compiler/integers/i8/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/le.out rename to tests/expectations/compiler/integers/i8/le.out diff --git a/tests/expectations/compiler/compiler/integers/i8/lt.out b/tests/expectations/compiler/integers/i8/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/lt.out rename to tests/expectations/compiler/integers/i8/lt.out diff --git a/tests/expectations/compiler/compiler/integers/i8/max.out b/tests/expectations/compiler/integers/i8/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/max.out rename to tests/expectations/compiler/integers/i8/max.out diff --git a/tests/expectations/compiler/compiler/integers/i8/max_fail.out b/tests/expectations/compiler/integers/i8/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/max_fail.out rename to tests/expectations/compiler/integers/i8/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i8/min.out b/tests/expectations/compiler/integers/i8/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/min.out rename to tests/expectations/compiler/integers/i8/min.out diff --git a/tests/expectations/compiler/compiler/integers/i8/min_fail.out b/tests/expectations/compiler/integers/i8/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/min_fail.out rename to tests/expectations/compiler/integers/i8/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/i8/mul.out b/tests/expectations/compiler/integers/i8/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/mul.out rename to tests/expectations/compiler/integers/i8/mul.out diff --git a/tests/expectations/compiler/compiler/integers/i8/ne.out b/tests/expectations/compiler/integers/i8/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/ne.out rename to tests/expectations/compiler/integers/i8/ne.out diff --git a/tests/expectations/compiler/compiler/integers/i8/negate.out b/tests/expectations/compiler/integers/i8/negate.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/negate.out rename to tests/expectations/compiler/integers/i8/negate.out diff --git a/tests/expectations/compiler/compiler/integers/i8/negate_min.out b/tests/expectations/compiler/integers/i8/negate_min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/negate_min.out rename to tests/expectations/compiler/integers/i8/negate_min.out diff --git a/tests/expectations/compiler/compiler/integers/i8/negate_zero.out b/tests/expectations/compiler/integers/i8/negate_zero.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/negate_zero.out rename to tests/expectations/compiler/integers/i8/negate_zero.out diff --git a/tests/expectations/compiler/compiler/integers/i8/no_space_between_literal.out b/tests/expectations/compiler/integers/i8/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/no_space_between_literal.out rename to tests/expectations/compiler/integers/i8/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/i8/operator_methods.out b/tests/expectations/compiler/integers/i8/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/operator_methods.out rename to tests/expectations/compiler/integers/i8/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/i8/or.out b/tests/expectations/compiler/integers/i8/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/or.out rename to tests/expectations/compiler/integers/i8/or.out diff --git a/tests/expectations/compiler/compiler/integers/i8/pow.out b/tests/expectations/compiler/integers/i8/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/pow.out rename to tests/expectations/compiler/integers/i8/pow.out diff --git a/tests/expectations/compiler/compiler/integers/i8/shl.out b/tests/expectations/compiler/integers/i8/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/shl.out rename to tests/expectations/compiler/integers/i8/shl.out diff --git a/tests/expectations/compiler/compiler/integers/i8/shr.out b/tests/expectations/compiler/integers/i8/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/shr.out rename to tests/expectations/compiler/integers/i8/shr.out diff --git a/tests/expectations/compiler/compiler/integers/i8/sub.out b/tests/expectations/compiler/integers/i8/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/sub.out rename to tests/expectations/compiler/integers/i8/sub.out diff --git a/tests/expectations/compiler/compiler/integers/i8/ternary.out b/tests/expectations/compiler/integers/i8/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/ternary.out rename to tests/expectations/compiler/integers/i8/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/i8/xor.out b/tests/expectations/compiler/integers/i8/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/i8/xor.out rename to tests/expectations/compiler/integers/i8/xor.out diff --git a/tests/expectations/compiler/compiler/integers/u128/add.out b/tests/expectations/compiler/integers/u128/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/add.out rename to tests/expectations/compiler/integers/u128/add.out diff --git a/tests/expectations/compiler/compiler/integers/u128/and.out b/tests/expectations/compiler/integers/u128/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/and.out rename to tests/expectations/compiler/integers/u128/and.out diff --git a/tests/expectations/compiler/compiler/integers/u128/console_assert.out b/tests/expectations/compiler/integers/u128/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/console_assert.out rename to tests/expectations/compiler/integers/u128/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/u128/div.out b/tests/expectations/compiler/integers/u128/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/div.out rename to tests/expectations/compiler/integers/u128/div.out diff --git a/tests/expectations/compiler/compiler/integers/u128/eq.out b/tests/expectations/compiler/integers/u128/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/eq.out rename to tests/expectations/compiler/integers/u128/eq.out diff --git a/tests/expectations/compiler/compiler/integers/u128/ge.out b/tests/expectations/compiler/integers/u128/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/ge.out rename to tests/expectations/compiler/integers/u128/ge.out diff --git a/tests/expectations/compiler/compiler/integers/u128/gt.out b/tests/expectations/compiler/integers/u128/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/gt.out rename to tests/expectations/compiler/integers/u128/gt.out diff --git a/tests/expectations/compiler/compiler/integers/u128/le.out b/tests/expectations/compiler/integers/u128/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/le.out rename to tests/expectations/compiler/integers/u128/le.out diff --git a/tests/expectations/compiler/compiler/integers/u128/lt.out b/tests/expectations/compiler/integers/u128/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/lt.out rename to tests/expectations/compiler/integers/u128/lt.out diff --git a/tests/expectations/compiler/compiler/integers/u128/max.out b/tests/expectations/compiler/integers/u128/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/max.out rename to tests/expectations/compiler/integers/u128/max.out diff --git a/tests/expectations/compiler/compiler/integers/u128/max_fail.out b/tests/expectations/compiler/integers/u128/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/max_fail.out rename to tests/expectations/compiler/integers/u128/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u128/min.out b/tests/expectations/compiler/integers/u128/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/min.out rename to tests/expectations/compiler/integers/u128/min.out diff --git a/tests/expectations/compiler/compiler/integers/u128/min_fail.out b/tests/expectations/compiler/integers/u128/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/min_fail.out rename to tests/expectations/compiler/integers/u128/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u128/mul.out b/tests/expectations/compiler/integers/u128/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/mul.out rename to tests/expectations/compiler/integers/u128/mul.out diff --git a/tests/expectations/compiler/compiler/integers/u128/ne.out b/tests/expectations/compiler/integers/u128/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/ne.out rename to tests/expectations/compiler/integers/u128/ne.out diff --git a/tests/expectations/compiler/compiler/integers/u128/no_space_between_literal.out b/tests/expectations/compiler/integers/u128/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/no_space_between_literal.out rename to tests/expectations/compiler/integers/u128/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/u128/operator_methods.out b/tests/expectations/compiler/integers/u128/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/operator_methods.out rename to tests/expectations/compiler/integers/u128/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/u128/or.out b/tests/expectations/compiler/integers/u128/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/or.out rename to tests/expectations/compiler/integers/u128/or.out diff --git a/tests/expectations/compiler/compiler/integers/u128/pow.out b/tests/expectations/compiler/integers/u128/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/pow.out rename to tests/expectations/compiler/integers/u128/pow.out diff --git a/tests/expectations/compiler/compiler/integers/u128/shl.out b/tests/expectations/compiler/integers/u128/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/shl.out rename to tests/expectations/compiler/integers/u128/shl.out diff --git a/tests/expectations/compiler/compiler/integers/u128/shr.out b/tests/expectations/compiler/integers/u128/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/shr.out rename to tests/expectations/compiler/integers/u128/shr.out diff --git a/tests/expectations/compiler/compiler/integers/u128/sub.out b/tests/expectations/compiler/integers/u128/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/sub.out rename to tests/expectations/compiler/integers/u128/sub.out diff --git a/tests/expectations/compiler/compiler/integers/u128/ternary.out b/tests/expectations/compiler/integers/u128/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/ternary.out rename to tests/expectations/compiler/integers/u128/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/u128/xor.out b/tests/expectations/compiler/integers/u128/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u128/xor.out rename to tests/expectations/compiler/integers/u128/xor.out diff --git a/tests/expectations/compiler/compiler/integers/u16/add.out b/tests/expectations/compiler/integers/u16/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/add.out rename to tests/expectations/compiler/integers/u16/add.out diff --git a/tests/expectations/compiler/compiler/integers/u16/and.out b/tests/expectations/compiler/integers/u16/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/and.out rename to tests/expectations/compiler/integers/u16/and.out diff --git a/tests/expectations/compiler/compiler/integers/u16/console_assert.out b/tests/expectations/compiler/integers/u16/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/console_assert.out rename to tests/expectations/compiler/integers/u16/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/u16/div.out b/tests/expectations/compiler/integers/u16/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/div.out rename to tests/expectations/compiler/integers/u16/div.out diff --git a/tests/expectations/compiler/compiler/integers/u16/eq.out b/tests/expectations/compiler/integers/u16/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/eq.out rename to tests/expectations/compiler/integers/u16/eq.out diff --git a/tests/expectations/compiler/compiler/integers/u16/ge.out b/tests/expectations/compiler/integers/u16/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/ge.out rename to tests/expectations/compiler/integers/u16/ge.out diff --git a/tests/expectations/compiler/compiler/integers/u16/gt.out b/tests/expectations/compiler/integers/u16/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/gt.out rename to tests/expectations/compiler/integers/u16/gt.out diff --git a/tests/expectations/compiler/compiler/integers/u16/le.out b/tests/expectations/compiler/integers/u16/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/le.out rename to tests/expectations/compiler/integers/u16/le.out diff --git a/tests/expectations/compiler/compiler/integers/u16/lt.out b/tests/expectations/compiler/integers/u16/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/lt.out rename to tests/expectations/compiler/integers/u16/lt.out diff --git a/tests/expectations/compiler/compiler/integers/u16/max.out b/tests/expectations/compiler/integers/u16/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/max.out rename to tests/expectations/compiler/integers/u16/max.out diff --git a/tests/expectations/compiler/compiler/integers/u16/max_fail.out b/tests/expectations/compiler/integers/u16/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/max_fail.out rename to tests/expectations/compiler/integers/u16/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u16/min.out b/tests/expectations/compiler/integers/u16/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/min.out rename to tests/expectations/compiler/integers/u16/min.out diff --git a/tests/expectations/compiler/compiler/integers/u16/min_fail.out b/tests/expectations/compiler/integers/u16/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/min_fail.out rename to tests/expectations/compiler/integers/u16/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u16/mul.out b/tests/expectations/compiler/integers/u16/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/mul.out rename to tests/expectations/compiler/integers/u16/mul.out diff --git a/tests/expectations/compiler/compiler/integers/u16/ne.out b/tests/expectations/compiler/integers/u16/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/ne.out rename to tests/expectations/compiler/integers/u16/ne.out diff --git a/tests/expectations/compiler/compiler/integers/u16/no_space_between_literal.out b/tests/expectations/compiler/integers/u16/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/no_space_between_literal.out rename to tests/expectations/compiler/integers/u16/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/u16/operator_methods.out b/tests/expectations/compiler/integers/u16/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/operator_methods.out rename to tests/expectations/compiler/integers/u16/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/u16/or.out b/tests/expectations/compiler/integers/u16/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/or.out rename to tests/expectations/compiler/integers/u16/or.out diff --git a/tests/expectations/compiler/compiler/integers/u16/pow.out b/tests/expectations/compiler/integers/u16/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/pow.out rename to tests/expectations/compiler/integers/u16/pow.out diff --git a/tests/expectations/compiler/compiler/integers/u16/shl.out b/tests/expectations/compiler/integers/u16/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/shl.out rename to tests/expectations/compiler/integers/u16/shl.out diff --git a/tests/expectations/compiler/compiler/integers/u16/shr.out b/tests/expectations/compiler/integers/u16/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/shr.out rename to tests/expectations/compiler/integers/u16/shr.out diff --git a/tests/expectations/compiler/compiler/integers/u16/sub.out b/tests/expectations/compiler/integers/u16/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/sub.out rename to tests/expectations/compiler/integers/u16/sub.out diff --git a/tests/expectations/compiler/compiler/integers/u16/ternary.out b/tests/expectations/compiler/integers/u16/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/ternary.out rename to tests/expectations/compiler/integers/u16/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/u16/xor.out b/tests/expectations/compiler/integers/u16/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u16/xor.out rename to tests/expectations/compiler/integers/u16/xor.out diff --git a/tests/expectations/compiler/compiler/integers/u32/add.out b/tests/expectations/compiler/integers/u32/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/add.out rename to tests/expectations/compiler/integers/u32/add.out diff --git a/tests/expectations/compiler/compiler/integers/u32/and.out b/tests/expectations/compiler/integers/u32/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/and.out rename to tests/expectations/compiler/integers/u32/and.out diff --git a/tests/expectations/compiler/compiler/integers/u32/console_assert.out b/tests/expectations/compiler/integers/u32/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/console_assert.out rename to tests/expectations/compiler/integers/u32/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/u32/div.out b/tests/expectations/compiler/integers/u32/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/div.out rename to tests/expectations/compiler/integers/u32/div.out diff --git a/tests/expectations/compiler/compiler/integers/u32/eq.out b/tests/expectations/compiler/integers/u32/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/eq.out rename to tests/expectations/compiler/integers/u32/eq.out diff --git a/tests/expectations/compiler/compiler/integers/u32/ge.out b/tests/expectations/compiler/integers/u32/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/ge.out rename to tests/expectations/compiler/integers/u32/ge.out diff --git a/tests/expectations/compiler/compiler/integers/u32/gt.out b/tests/expectations/compiler/integers/u32/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/gt.out rename to tests/expectations/compiler/integers/u32/gt.out diff --git a/tests/expectations/compiler/compiler/integers/u32/le.out b/tests/expectations/compiler/integers/u32/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/le.out rename to tests/expectations/compiler/integers/u32/le.out diff --git a/tests/expectations/compiler/compiler/integers/u32/lt.out b/tests/expectations/compiler/integers/u32/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/lt.out rename to tests/expectations/compiler/integers/u32/lt.out diff --git a/tests/expectations/compiler/compiler/integers/u32/max.out b/tests/expectations/compiler/integers/u32/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/max.out rename to tests/expectations/compiler/integers/u32/max.out diff --git a/tests/expectations/compiler/compiler/integers/u32/max_fail.out b/tests/expectations/compiler/integers/u32/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/max_fail.out rename to tests/expectations/compiler/integers/u32/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u32/min.out b/tests/expectations/compiler/integers/u32/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/min.out rename to tests/expectations/compiler/integers/u32/min.out diff --git a/tests/expectations/compiler/compiler/integers/u32/min_fail.out b/tests/expectations/compiler/integers/u32/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/min_fail.out rename to tests/expectations/compiler/integers/u32/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u32/mul.out b/tests/expectations/compiler/integers/u32/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/mul.out rename to tests/expectations/compiler/integers/u32/mul.out diff --git a/tests/expectations/compiler/compiler/integers/u32/ne.out b/tests/expectations/compiler/integers/u32/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/ne.out rename to tests/expectations/compiler/integers/u32/ne.out diff --git a/tests/expectations/compiler/compiler/integers/u32/no_space_between_literal.out b/tests/expectations/compiler/integers/u32/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/no_space_between_literal.out rename to tests/expectations/compiler/integers/u32/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/u32/operator_methods.out b/tests/expectations/compiler/integers/u32/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/operator_methods.out rename to tests/expectations/compiler/integers/u32/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/u32/or.out b/tests/expectations/compiler/integers/u32/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/or.out rename to tests/expectations/compiler/integers/u32/or.out diff --git a/tests/expectations/compiler/compiler/integers/u32/pow.out b/tests/expectations/compiler/integers/u32/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/pow.out rename to tests/expectations/compiler/integers/u32/pow.out diff --git a/tests/expectations/compiler/compiler/integers/u32/shl.out b/tests/expectations/compiler/integers/u32/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/shl.out rename to tests/expectations/compiler/integers/u32/shl.out diff --git a/tests/expectations/compiler/compiler/integers/u32/shr.out b/tests/expectations/compiler/integers/u32/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/shr.out rename to tests/expectations/compiler/integers/u32/shr.out diff --git a/tests/expectations/compiler/compiler/integers/u32/sub.out b/tests/expectations/compiler/integers/u32/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/sub.out rename to tests/expectations/compiler/integers/u32/sub.out diff --git a/tests/expectations/compiler/compiler/integers/u32/ternary.out b/tests/expectations/compiler/integers/u32/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/ternary.out rename to tests/expectations/compiler/integers/u32/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/u32/xor.out b/tests/expectations/compiler/integers/u32/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u32/xor.out rename to tests/expectations/compiler/integers/u32/xor.out diff --git a/tests/expectations/compiler/compiler/integers/u64/add.out b/tests/expectations/compiler/integers/u64/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/add.out rename to tests/expectations/compiler/integers/u64/add.out diff --git a/tests/expectations/compiler/compiler/integers/u64/and.out b/tests/expectations/compiler/integers/u64/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/and.out rename to tests/expectations/compiler/integers/u64/and.out diff --git a/tests/expectations/compiler/compiler/integers/u64/console_assert.out b/tests/expectations/compiler/integers/u64/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/console_assert.out rename to tests/expectations/compiler/integers/u64/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/u64/div.out b/tests/expectations/compiler/integers/u64/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/div.out rename to tests/expectations/compiler/integers/u64/div.out diff --git a/tests/expectations/compiler/compiler/integers/u64/eq.out b/tests/expectations/compiler/integers/u64/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/eq.out rename to tests/expectations/compiler/integers/u64/eq.out diff --git a/tests/expectations/compiler/compiler/integers/u64/ge.out b/tests/expectations/compiler/integers/u64/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/ge.out rename to tests/expectations/compiler/integers/u64/ge.out diff --git a/tests/expectations/compiler/compiler/integers/u64/gt.out b/tests/expectations/compiler/integers/u64/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/gt.out rename to tests/expectations/compiler/integers/u64/gt.out diff --git a/tests/expectations/compiler/compiler/integers/u64/le.out b/tests/expectations/compiler/integers/u64/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/le.out rename to tests/expectations/compiler/integers/u64/le.out diff --git a/tests/expectations/compiler/compiler/integers/u64/lt.out b/tests/expectations/compiler/integers/u64/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/lt.out rename to tests/expectations/compiler/integers/u64/lt.out diff --git a/tests/expectations/compiler/compiler/integers/u64/max.out b/tests/expectations/compiler/integers/u64/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/max.out rename to tests/expectations/compiler/integers/u64/max.out diff --git a/tests/expectations/compiler/compiler/integers/u64/max_fail.out b/tests/expectations/compiler/integers/u64/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/max_fail.out rename to tests/expectations/compiler/integers/u64/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u64/min.out b/tests/expectations/compiler/integers/u64/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/min.out rename to tests/expectations/compiler/integers/u64/min.out diff --git a/tests/expectations/compiler/compiler/integers/u64/min_fail.out b/tests/expectations/compiler/integers/u64/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/min_fail.out rename to tests/expectations/compiler/integers/u64/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u64/mul.out b/tests/expectations/compiler/integers/u64/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/mul.out rename to tests/expectations/compiler/integers/u64/mul.out diff --git a/tests/expectations/compiler/compiler/integers/u64/ne.out b/tests/expectations/compiler/integers/u64/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/ne.out rename to tests/expectations/compiler/integers/u64/ne.out diff --git a/tests/expectations/compiler/compiler/integers/u64/no_space_between_literal.out b/tests/expectations/compiler/integers/u64/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/no_space_between_literal.out rename to tests/expectations/compiler/integers/u64/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/u64/operator_methods.out b/tests/expectations/compiler/integers/u64/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/operator_methods.out rename to tests/expectations/compiler/integers/u64/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/u64/or.out b/tests/expectations/compiler/integers/u64/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/or.out rename to tests/expectations/compiler/integers/u64/or.out diff --git a/tests/expectations/compiler/compiler/integers/u64/pow.out b/tests/expectations/compiler/integers/u64/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/pow.out rename to tests/expectations/compiler/integers/u64/pow.out diff --git a/tests/expectations/compiler/compiler/integers/u64/shl.out b/tests/expectations/compiler/integers/u64/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/shl.out rename to tests/expectations/compiler/integers/u64/shl.out diff --git a/tests/expectations/compiler/compiler/integers/u64/shr.out b/tests/expectations/compiler/integers/u64/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/shr.out rename to tests/expectations/compiler/integers/u64/shr.out diff --git a/tests/expectations/compiler/compiler/integers/u64/sub.out b/tests/expectations/compiler/integers/u64/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/sub.out rename to tests/expectations/compiler/integers/u64/sub.out diff --git a/tests/expectations/compiler/compiler/integers/u64/ternary.out b/tests/expectations/compiler/integers/u64/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/ternary.out rename to tests/expectations/compiler/integers/u64/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/u64/xor.out b/tests/expectations/compiler/integers/u64/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u64/xor.out rename to tests/expectations/compiler/integers/u64/xor.out diff --git a/tests/expectations/compiler/compiler/integers/u8/add.out b/tests/expectations/compiler/integers/u8/add.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/add.out rename to tests/expectations/compiler/integers/u8/add.out diff --git a/tests/expectations/compiler/compiler/integers/u8/and.out b/tests/expectations/compiler/integers/u8/and.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/and.out rename to tests/expectations/compiler/integers/u8/and.out diff --git a/tests/expectations/compiler/compiler/integers/u8/console_assert.out b/tests/expectations/compiler/integers/u8/console_assert.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/console_assert.out rename to tests/expectations/compiler/integers/u8/console_assert.out diff --git a/tests/expectations/compiler/compiler/integers/u8/div.out b/tests/expectations/compiler/integers/u8/div.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/div.out rename to tests/expectations/compiler/integers/u8/div.out diff --git a/tests/expectations/compiler/compiler/integers/u8/eq.out b/tests/expectations/compiler/integers/u8/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/eq.out rename to tests/expectations/compiler/integers/u8/eq.out diff --git a/tests/expectations/compiler/compiler/integers/u8/ge.out b/tests/expectations/compiler/integers/u8/ge.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/ge.out rename to tests/expectations/compiler/integers/u8/ge.out diff --git a/tests/expectations/compiler/compiler/integers/u8/gt.out b/tests/expectations/compiler/integers/u8/gt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/gt.out rename to tests/expectations/compiler/integers/u8/gt.out diff --git a/tests/expectations/compiler/compiler/integers/u8/le.out b/tests/expectations/compiler/integers/u8/le.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/le.out rename to tests/expectations/compiler/integers/u8/le.out diff --git a/tests/expectations/compiler/compiler/integers/u8/lt.out b/tests/expectations/compiler/integers/u8/lt.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/lt.out rename to tests/expectations/compiler/integers/u8/lt.out diff --git a/tests/expectations/compiler/compiler/integers/u8/max.out b/tests/expectations/compiler/integers/u8/max.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/max.out rename to tests/expectations/compiler/integers/u8/max.out diff --git a/tests/expectations/compiler/compiler/integers/u8/max_fail.out b/tests/expectations/compiler/integers/u8/max_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/max_fail.out rename to tests/expectations/compiler/integers/u8/max_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u8/min.out b/tests/expectations/compiler/integers/u8/min.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/min.out rename to tests/expectations/compiler/integers/u8/min.out diff --git a/tests/expectations/compiler/compiler/integers/u8/min_fail.out b/tests/expectations/compiler/integers/u8/min_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/min_fail.out rename to tests/expectations/compiler/integers/u8/min_fail.out diff --git a/tests/expectations/compiler/compiler/integers/u8/mul.out b/tests/expectations/compiler/integers/u8/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/mul.out rename to tests/expectations/compiler/integers/u8/mul.out diff --git a/tests/expectations/compiler/compiler/integers/u8/ne.out b/tests/expectations/compiler/integers/u8/ne.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/ne.out rename to tests/expectations/compiler/integers/u8/ne.out diff --git a/tests/expectations/compiler/compiler/integers/u8/no_space_between_literal.out b/tests/expectations/compiler/integers/u8/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/no_space_between_literal.out rename to tests/expectations/compiler/integers/u8/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/integers/u8/operator_methods.out b/tests/expectations/compiler/integers/u8/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/operator_methods.out rename to tests/expectations/compiler/integers/u8/operator_methods.out diff --git a/tests/expectations/compiler/compiler/integers/u8/or.out b/tests/expectations/compiler/integers/u8/or.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/or.out rename to tests/expectations/compiler/integers/u8/or.out diff --git a/tests/expectations/compiler/compiler/integers/u8/pow.out b/tests/expectations/compiler/integers/u8/pow.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/pow.out rename to tests/expectations/compiler/integers/u8/pow.out diff --git a/tests/expectations/compiler/compiler/integers/u8/shl.out b/tests/expectations/compiler/integers/u8/shl.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/shl.out rename to tests/expectations/compiler/integers/u8/shl.out diff --git a/tests/expectations/compiler/compiler/integers/u8/shr.out b/tests/expectations/compiler/integers/u8/shr.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/shr.out rename to tests/expectations/compiler/integers/u8/shr.out diff --git a/tests/expectations/compiler/compiler/integers/u8/sub.out b/tests/expectations/compiler/integers/u8/sub.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/sub.out rename to tests/expectations/compiler/integers/u8/sub.out diff --git a/tests/expectations/compiler/compiler/integers/u8/ternary.out b/tests/expectations/compiler/integers/u8/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/ternary.out rename to tests/expectations/compiler/integers/u8/ternary.out diff --git a/tests/expectations/compiler/compiler/integers/u8/xor.out b/tests/expectations/compiler/integers/u8/xor.out similarity index 100% rename from tests/expectations/compiler/compiler/integers/u8/xor.out rename to tests/expectations/compiler/integers/u8/xor.out diff --git a/tests/expectations/compiler/compiler/mutability/cond_mut.out b/tests/expectations/compiler/mutability/cond_mut.out similarity index 100% rename from tests/expectations/compiler/compiler/mutability/cond_mut.out rename to tests/expectations/compiler/mutability/cond_mut.out diff --git a/tests/expectations/compiler/compiler/mutability/function_input_mut.out b/tests/expectations/compiler/mutability/function_input_mut.out similarity index 100% rename from tests/expectations/compiler/compiler/mutability/function_input_mut.out rename to tests/expectations/compiler/mutability/function_input_mut.out diff --git a/tests/expectations/compiler/compiler/mutability/let_mut_nested.out b/tests/expectations/compiler/mutability/let_mut_nested.out similarity index 100% rename from tests/expectations/compiler/compiler/mutability/let_mut_nested.out rename to tests/expectations/compiler/mutability/let_mut_nested.out diff --git a/tests/expectations/compiler/compiler/records/balance_wrong_ty.out b/tests/expectations/compiler/records/balance_wrong_ty.out similarity index 100% rename from tests/expectations/compiler/compiler/records/balance_wrong_ty.out rename to tests/expectations/compiler/records/balance_wrong_ty.out diff --git a/tests/expectations/compiler/compiler/records/declaration.out b/tests/expectations/compiler/records/declaration.out similarity index 100% rename from tests/expectations/compiler/compiler/records/declaration.out rename to tests/expectations/compiler/records/declaration.out diff --git a/tests/expectations/compiler/compiler/records/duplicate_circuit_name_fail.out b/tests/expectations/compiler/records/duplicate_circuit_name_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/records/duplicate_circuit_name_fail.out rename to tests/expectations/compiler/records/duplicate_circuit_name_fail.out diff --git a/tests/expectations/compiler/compiler/records/duplicate_var_fail.out b/tests/expectations/compiler/records/duplicate_var_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/records/duplicate_var_fail.out rename to tests/expectations/compiler/records/duplicate_var_fail.out diff --git a/tests/expectations/compiler/compiler/records/init_expression.out b/tests/expectations/compiler/records/init_expression.out similarity index 100% rename from tests/expectations/compiler/compiler/records/init_expression.out rename to tests/expectations/compiler/records/init_expression.out diff --git a/tests/expectations/compiler/compiler/records/init_expression_shorthand.out b/tests/expectations/compiler/records/init_expression_shorthand.out similarity index 100% rename from tests/expectations/compiler/compiler/records/init_expression_shorthand.out rename to tests/expectations/compiler/records/init_expression_shorthand.out diff --git a/tests/expectations/compiler/compiler/records/init_expression_type_fail.out b/tests/expectations/compiler/records/init_expression_type_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/records/init_expression_type_fail.out rename to tests/expectations/compiler/records/init_expression_type_fail.out diff --git a/tests/expectations/compiler/compiler/records/init_expression_var_fail.out b/tests/expectations/compiler/records/init_expression_var_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/records/init_expression_var_fail.out rename to tests/expectations/compiler/records/init_expression_var_fail.out diff --git a/tests/expectations/compiler/compiler/records/no_owner_fail.out b/tests/expectations/compiler/records/no_owner_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/records/no_owner_fail.out rename to tests/expectations/compiler/records/no_owner_fail.out diff --git a/tests/expectations/compiler/compiler/records/owner_wrong_ty.out b/tests/expectations/compiler/records/owner_wrong_ty.out similarity index 100% rename from tests/expectations/compiler/compiler/records/owner_wrong_ty.out rename to tests/expectations/compiler/records/owner_wrong_ty.out diff --git a/tests/expectations/compiler/compiler/scalar/add.out b/tests/expectations/compiler/scalar/add.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/add.out rename to tests/expectations/compiler/scalar/add.out diff --git a/tests/expectations/compiler/compiler/scalar/cmp.out b/tests/expectations/compiler/scalar/cmp.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/cmp.out rename to tests/expectations/compiler/scalar/cmp.out diff --git a/tests/expectations/compiler/compiler/scalar/div.out b/tests/expectations/compiler/scalar/div.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/div.out rename to tests/expectations/compiler/scalar/div.out diff --git a/tests/expectations/compiler/compiler/scalar/eq.out b/tests/expectations/compiler/scalar/eq.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/eq.out rename to tests/expectations/compiler/scalar/eq.out diff --git a/tests/expectations/compiler/compiler/scalar/group_mul.out b/tests/expectations/compiler/scalar/group_mul.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/group_mul.out rename to tests/expectations/compiler/scalar/group_mul.out diff --git a/tests/expectations/compiler/compiler/scalar/mul.out b/tests/expectations/compiler/scalar/mul.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/mul.out rename to tests/expectations/compiler/scalar/mul.out diff --git a/tests/expectations/compiler/compiler/scalar/no_space_between_literal.out b/tests/expectations/compiler/scalar/no_space_between_literal.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/no_space_between_literal.out rename to tests/expectations/compiler/scalar/no_space_between_literal.out diff --git a/tests/expectations/compiler/compiler/scalar/operator_methods.out b/tests/expectations/compiler/scalar/operator_methods.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/operator_methods.out rename to tests/expectations/compiler/scalar/operator_methods.out diff --git a/tests/expectations/compiler/compiler/scalar/scalar.out b/tests/expectations/compiler/scalar/scalar.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/scalar.out rename to tests/expectations/compiler/scalar/scalar.out diff --git a/tests/expectations/compiler/compiler/scalar/ternary.out b/tests/expectations/compiler/scalar/ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/scalar/ternary.out rename to tests/expectations/compiler/scalar/ternary.out diff --git a/tests/expectations/compiler/compiler/statements/all_loops.out b/tests/expectations/compiler/statements/all_loops.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/all_loops.out rename to tests/expectations/compiler/statements/all_loops.out diff --git a/tests/expectations/compiler/compiler/statements/all_loops_fail.out b/tests/expectations/compiler/statements/all_loops_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/all_loops_fail.out rename to tests/expectations/compiler/statements/all_loops_fail.out diff --git a/tests/expectations/compiler/compiler/statements/assign_fail.out b/tests/expectations/compiler/statements/assign_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/assign_fail.out rename to tests/expectations/compiler/statements/assign_fail.out diff --git a/tests/expectations/compiler/compiler/statements/assign_ternary.out b/tests/expectations/compiler/statements/assign_ternary.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/assign_ternary.out rename to tests/expectations/compiler/statements/assign_ternary.out diff --git a/tests/expectations/compiler/compiler/statements/block.out b/tests/expectations/compiler/statements/block.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/block.out rename to tests/expectations/compiler/statements/block.out diff --git a/tests/expectations/compiler/compiler/statements/chain.out b/tests/expectations/compiler/statements/chain.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/chain.out rename to tests/expectations/compiler/statements/chain.out diff --git a/tests/expectations/compiler/compiler/statements/compare_diff_types_fail.out b/tests/expectations/compiler/statements/compare_diff_types_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/compare_diff_types_fail.out rename to tests/expectations/compiler/statements/compare_diff_types_fail.out diff --git a/tests/expectations/compiler/compiler/statements/compare_invalid_negates_fail.out b/tests/expectations/compiler/statements/compare_invalid_negates_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/compare_invalid_negates_fail.out rename to tests/expectations/compiler/statements/compare_invalid_negates_fail.out diff --git a/tests/expectations/compiler/compiler/statements/duplicate_variable.out b/tests/expectations/compiler/statements/duplicate_variable.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/duplicate_variable.out rename to tests/expectations/compiler/statements/duplicate_variable.out diff --git a/tests/expectations/compiler/compiler/statements/for_loop.out b/tests/expectations/compiler/statements/for_loop.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/for_loop.out rename to tests/expectations/compiler/statements/for_loop.out diff --git a/tests/expectations/compiler/compiler/statements/iteration_basic.out b/tests/expectations/compiler/statements/iteration_basic.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/iteration_basic.out rename to tests/expectations/compiler/statements/iteration_basic.out diff --git a/tests/expectations/compiler/compiler/statements/iteration_variable.out b/tests/expectations/compiler/statements/iteration_variable.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/iteration_variable.out rename to tests/expectations/compiler/statements/iteration_variable.out diff --git a/tests/expectations/compiler/compiler/statements/multiple_returns.out b/tests/expectations/compiler/statements/multiple_returns.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/multiple_returns.out rename to tests/expectations/compiler/statements/multiple_returns.out diff --git a/tests/expectations/compiler/compiler/statements/mutate.out b/tests/expectations/compiler/statements/mutate.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/mutate.out rename to tests/expectations/compiler/statements/mutate.out diff --git a/tests/expectations/compiler/compiler/statements/non_existant_var_exp_fail.out b/tests/expectations/compiler/statements/non_existant_var_exp_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/non_existant_var_exp_fail.out rename to tests/expectations/compiler/statements/non_existant_var_exp_fail.out diff --git a/tests/expectations/compiler/compiler/statements/non_existant_vars_mul_fail.out b/tests/expectations/compiler/statements/non_existant_vars_mul_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/non_existant_vars_mul_fail.out rename to tests/expectations/compiler/statements/non_existant_vars_mul_fail.out diff --git a/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.out b/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out similarity index 100% rename from tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.out rename to tests/expectations/compiler/statements/ternary_explicit_and_implicit.out diff --git a/tests/expectations/compiler/compiler/tuple/access.out b/tests/expectations/compiler/tuple/access.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/access.out rename to tests/expectations/compiler/tuple/access.out diff --git a/tests/expectations/compiler/compiler/tuple/access_negative_fail.out b/tests/expectations/compiler/tuple/access_negative_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/access_negative_fail.out rename to tests/expectations/compiler/tuple/access_negative_fail.out diff --git a/tests/expectations/compiler/compiler/tuple/access_out_of_bounds_fail.out b/tests/expectations/compiler/tuple/access_out_of_bounds_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/access_out_of_bounds_fail.out rename to tests/expectations/compiler/tuple/access_out_of_bounds_fail.out diff --git a/tests/expectations/compiler/compiler/tuple/declare_fail.out b/tests/expectations/compiler/tuple/declare_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/declare_fail.out rename to tests/expectations/compiler/tuple/declare_fail.out diff --git a/tests/expectations/compiler/compiler/tuple/function_return.out b/tests/expectations/compiler/tuple/function_return.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/function_return.out rename to tests/expectations/compiler/tuple/function_return.out diff --git a/tests/expectations/compiler/compiler/tuple/function_return_single_fail.out b/tests/expectations/compiler/tuple/function_return_single_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/function_return_single_fail.out rename to tests/expectations/compiler/tuple/function_return_single_fail.out diff --git a/tests/expectations/compiler/compiler/tuple/function_return_zero_fail.out b/tests/expectations/compiler/tuple/function_return_zero_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/function_return_zero_fail.out rename to tests/expectations/compiler/tuple/function_return_zero_fail.out diff --git a/tests/expectations/compiler/compiler/tuple/return_statement_fail.out b/tests/expectations/compiler/tuple/return_statement_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/return_statement_fail.out rename to tests/expectations/compiler/tuple/return_statement_fail.out diff --git a/tests/expectations/compiler/compiler/tuple/tuple_not_allowed.out b/tests/expectations/compiler/tuple/tuple_not_allowed.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/tuple_not_allowed.out rename to tests/expectations/compiler/tuple/tuple_not_allowed.out diff --git a/tests/expectations/compiler/compiler/tuple/type_fail.out b/tests/expectations/compiler/tuple/type_fail.out similarity index 100% rename from tests/expectations/compiler/compiler/tuple/type_fail.out rename to tests/expectations/compiler/tuple/type_fail.out diff --git a/tests/expectations/parser/parser/expression/access/call.out b/tests/expectations/parser/expression/access/call.out similarity index 100% rename from tests/expectations/parser/parser/expression/access/call.out rename to tests/expectations/parser/expression/access/call.out diff --git a/tests/expectations/parser/parser/expression/array_init_fail.out b/tests/expectations/parser/expression/array_init_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/array_init_fail.out rename to tests/expectations/parser/expression/array_init_fail.out diff --git a/tests/expectations/parser/parser/expression/array_inline_fail.out b/tests/expectations/parser/expression/array_inline_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/array_inline_fail.out rename to tests/expectations/parser/expression/array_inline_fail.out diff --git a/tests/expectations/parser/parser/expression/binary/add.out b/tests/expectations/parser/expression/binary/add.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/add.out rename to tests/expectations/parser/expression/binary/add.out diff --git a/tests/expectations/parser/parser/expression/binary/add_wrapped.out b/tests/expectations/parser/expression/binary/add_wrapped.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/add_wrapped.out rename to tests/expectations/parser/expression/binary/add_wrapped.out diff --git a/tests/expectations/parser/parser/expression/binary/and.out b/tests/expectations/parser/expression/binary/and.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/and.out rename to tests/expectations/parser/expression/binary/and.out diff --git a/tests/expectations/parser/parser/expression/binary/bit_and.out b/tests/expectations/parser/expression/binary/bit_and.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/bit_and.out rename to tests/expectations/parser/expression/binary/bit_and.out diff --git a/tests/expectations/parser/parser/expression/binary/bit_or.out b/tests/expectations/parser/expression/binary/bit_or.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/bit_or.out rename to tests/expectations/parser/expression/binary/bit_or.out diff --git a/tests/expectations/parser/parser/expression/binary/bit_xor.out b/tests/expectations/parser/expression/binary/bit_xor.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/bit_xor.out rename to tests/expectations/parser/expression/binary/bit_xor.out diff --git a/tests/expectations/parser/parser/expression/binary/div.out b/tests/expectations/parser/expression/binary/div.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/div.out rename to tests/expectations/parser/expression/binary/div.out diff --git a/tests/expectations/parser/parser/expression/binary/div_wrapped.out b/tests/expectations/parser/expression/binary/div_wrapped.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/div_wrapped.out rename to tests/expectations/parser/expression/binary/div_wrapped.out diff --git a/tests/expectations/parser/parser/expression/binary/eq.out b/tests/expectations/parser/expression/binary/eq.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/eq.out rename to tests/expectations/parser/expression/binary/eq.out diff --git a/tests/expectations/parser/parser/expression/binary/eq_fail.out b/tests/expectations/parser/expression/binary/eq_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/eq_fail.out rename to tests/expectations/parser/expression/binary/eq_fail.out diff --git a/tests/expectations/parser/parser/expression/binary/ge.out b/tests/expectations/parser/expression/binary/ge.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/ge.out rename to tests/expectations/parser/expression/binary/ge.out diff --git a/tests/expectations/parser/parser/expression/binary/ge_fail.out b/tests/expectations/parser/expression/binary/ge_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/ge_fail.out rename to tests/expectations/parser/expression/binary/ge_fail.out diff --git a/tests/expectations/parser/parser/expression/binary/gt.out b/tests/expectations/parser/expression/binary/gt.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/gt.out rename to tests/expectations/parser/expression/binary/gt.out diff --git a/tests/expectations/parser/parser/expression/binary/gt_fail.out b/tests/expectations/parser/expression/binary/gt_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/gt_fail.out rename to tests/expectations/parser/expression/binary/gt_fail.out diff --git a/tests/expectations/parser/parser/expression/binary/le.out b/tests/expectations/parser/expression/binary/le.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/le.out rename to tests/expectations/parser/expression/binary/le.out diff --git a/tests/expectations/parser/parser/expression/binary/le_fail.out b/tests/expectations/parser/expression/binary/le_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/le_fail.out rename to tests/expectations/parser/expression/binary/le_fail.out diff --git a/tests/expectations/parser/parser/expression/binary/lt.out b/tests/expectations/parser/expression/binary/lt.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/lt.out rename to tests/expectations/parser/expression/binary/lt.out diff --git a/tests/expectations/parser/parser/expression/binary/lt_fail.out b/tests/expectations/parser/expression/binary/lt_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/lt_fail.out rename to tests/expectations/parser/expression/binary/lt_fail.out diff --git a/tests/expectations/parser/parser/expression/binary/mul.out b/tests/expectations/parser/expression/binary/mul.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/mul.out rename to tests/expectations/parser/expression/binary/mul.out diff --git a/tests/expectations/parser/parser/expression/binary/mul_wrapped.out b/tests/expectations/parser/expression/binary/mul_wrapped.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/mul_wrapped.out rename to tests/expectations/parser/expression/binary/mul_wrapped.out diff --git a/tests/expectations/parser/parser/expression/binary/nand.out b/tests/expectations/parser/expression/binary/nand.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/nand.out rename to tests/expectations/parser/expression/binary/nand.out diff --git a/tests/expectations/parser/parser/expression/binary/neq.out b/tests/expectations/parser/expression/binary/neq.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/neq.out rename to tests/expectations/parser/expression/binary/neq.out diff --git a/tests/expectations/parser/parser/expression/binary/neq_fail.out b/tests/expectations/parser/expression/binary/neq_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/neq_fail.out rename to tests/expectations/parser/expression/binary/neq_fail.out diff --git a/tests/expectations/parser/parser/expression/binary/nor.out b/tests/expectations/parser/expression/binary/nor.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/nor.out rename to tests/expectations/parser/expression/binary/nor.out diff --git a/tests/expectations/parser/parser/expression/binary/or.out b/tests/expectations/parser/expression/binary/or.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/or.out rename to tests/expectations/parser/expression/binary/or.out diff --git a/tests/expectations/parser/parser/expression/binary/pow.out b/tests/expectations/parser/expression/binary/pow.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/pow.out rename to tests/expectations/parser/expression/binary/pow.out diff --git a/tests/expectations/parser/parser/expression/binary/pow_wrapped.out b/tests/expectations/parser/expression/binary/pow_wrapped.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/pow_wrapped.out rename to tests/expectations/parser/expression/binary/pow_wrapped.out diff --git a/tests/expectations/parser/parser/expression/binary/shl.out b/tests/expectations/parser/expression/binary/shl.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/shl.out rename to tests/expectations/parser/expression/binary/shl.out diff --git a/tests/expectations/parser/parser/expression/binary/shl_wrapped.out b/tests/expectations/parser/expression/binary/shl_wrapped.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/shl_wrapped.out rename to tests/expectations/parser/expression/binary/shl_wrapped.out diff --git a/tests/expectations/parser/parser/expression/binary/shr.out b/tests/expectations/parser/expression/binary/shr.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/shr.out rename to tests/expectations/parser/expression/binary/shr.out diff --git a/tests/expectations/parser/parser/expression/binary/shr_wrapped.out b/tests/expectations/parser/expression/binary/shr_wrapped.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/shr_wrapped.out rename to tests/expectations/parser/expression/binary/shr_wrapped.out diff --git a/tests/expectations/parser/parser/expression/binary/sub.out b/tests/expectations/parser/expression/binary/sub.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/sub.out rename to tests/expectations/parser/expression/binary/sub.out diff --git a/tests/expectations/parser/parser/expression/binary/sub_wrapped.out b/tests/expectations/parser/expression/binary/sub_wrapped.out similarity index 100% rename from tests/expectations/parser/parser/expression/binary/sub_wrapped.out rename to tests/expectations/parser/expression/binary/sub_wrapped.out diff --git a/tests/expectations/parser/parser/expression/circuit_init_fail.out b/tests/expectations/parser/expression/circuit_init_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/circuit_init_fail.out rename to tests/expectations/parser/expression/circuit_init_fail.out diff --git a/tests/expectations/parser/parser/expression/ident.out b/tests/expectations/parser/expression/ident.out similarity index 100% rename from tests/expectations/parser/parser/expression/ident.out rename to tests/expectations/parser/expression/ident.out diff --git a/tests/expectations/parser/parser/expression/literal/address.out b/tests/expectations/parser/expression/literal/address.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/address.out rename to tests/expectations/parser/expression/literal/address.out diff --git a/tests/expectations/parser/parser/expression/literal/address_fail.out b/tests/expectations/parser/expression/literal/address_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/address_fail.out rename to tests/expectations/parser/expression/literal/address_fail.out diff --git a/tests/expectations/parser/parser/expression/literal/address_parse.out b/tests/expectations/parser/expression/literal/address_parse.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/address_parse.out rename to tests/expectations/parser/expression/literal/address_parse.out diff --git a/tests/expectations/parser/parser/expression/literal/bool.out b/tests/expectations/parser/expression/literal/bool.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/bool.out rename to tests/expectations/parser/expression/literal/bool.out diff --git a/tests/expectations/parser/parser/expression/literal/bool_parse.out b/tests/expectations/parser/expression/literal/bool_parse.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/bool_parse.out rename to tests/expectations/parser/expression/literal/bool_parse.out diff --git a/tests/expectations/parser/parser/expression/literal/char.out b/tests/expectations/parser/expression/literal/char.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/char.out rename to tests/expectations/parser/expression/literal/char.out diff --git a/tests/expectations/parser/parser/expression/literal/char_fail.out b/tests/expectations/parser/expression/literal/char_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/char_fail.out rename to tests/expectations/parser/expression/literal/char_fail.out diff --git a/tests/expectations/parser/parser/expression/literal/char_parse.out b/tests/expectations/parser/expression/literal/char_parse.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/char_parse.out rename to tests/expectations/parser/expression/literal/char_parse.out diff --git a/tests/expectations/parser/parser/expression/literal/comment.out b/tests/expectations/parser/expression/literal/comment.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/comment.out rename to tests/expectations/parser/expression/literal/comment.out diff --git a/tests/expectations/parser/parser/expression/literal/comment_fail.out b/tests/expectations/parser/expression/literal/comment_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/comment_fail.out rename to tests/expectations/parser/expression/literal/comment_fail.out diff --git a/tests/expectations/parser/parser/expression/literal/formatted_string.out b/tests/expectations/parser/expression/literal/formatted_string.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/formatted_string.out rename to tests/expectations/parser/expression/literal/formatted_string.out diff --git a/tests/expectations/parser/parser/expression/literal/group.out b/tests/expectations/parser/expression/literal/group.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/group.out rename to tests/expectations/parser/expression/literal/group.out diff --git a/tests/expectations/parser/parser/expression/literal/group_fail.out b/tests/expectations/parser/expression/literal/group_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/group_fail.out rename to tests/expectations/parser/expression/literal/group_fail.out diff --git a/tests/expectations/parser/parser/expression/literal/int.out b/tests/expectations/parser/expression/literal/int.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int.out rename to tests/expectations/parser/expression/literal/int.out diff --git a/tests/expectations/parser/parser/expression/literal/int_fail.out b/tests/expectations/parser/expression/literal/int_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_fail.out rename to tests/expectations/parser/expression/literal/int_fail.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/field.out b/tests/expectations/parser/expression/literal/int_parse/field.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/field.out rename to tests/expectations/parser/expression/literal/int_parse/field.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/field_fail.out b/tests/expectations/parser/expression/literal/int_parse/field_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/field_fail.out rename to tests/expectations/parser/expression/literal/int_parse/field_fail.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i128.out b/tests/expectations/parser/expression/literal/int_parse/i128.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/i128.out rename to tests/expectations/parser/expression/literal/int_parse/i128.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i16.out b/tests/expectations/parser/expression/literal/int_parse/i16.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/i16.out rename to tests/expectations/parser/expression/literal/int_parse/i16.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i32.out b/tests/expectations/parser/expression/literal/int_parse/i32.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/i32.out rename to tests/expectations/parser/expression/literal/int_parse/i32.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i64.out b/tests/expectations/parser/expression/literal/int_parse/i64.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/i64.out rename to tests/expectations/parser/expression/literal/int_parse/i64.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i8.out b/tests/expectations/parser/expression/literal/int_parse/i8.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/i8.out rename to tests/expectations/parser/expression/literal/int_parse/i8.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/implicit.out b/tests/expectations/parser/expression/literal/int_parse/implicit.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/implicit.out rename to tests/expectations/parser/expression/literal/int_parse/implicit.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.out b/tests/expectations/parser/expression/literal/int_parse/mono_group.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/mono_group.out rename to tests/expectations/parser/expression/literal/int_parse/mono_group.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/scalar.out b/tests/expectations/parser/expression/literal/int_parse/scalar.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/scalar.out rename to tests/expectations/parser/expression/literal/int_parse/scalar.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u128.out b/tests/expectations/parser/expression/literal/int_parse/u128.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/u128.out rename to tests/expectations/parser/expression/literal/int_parse/u128.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u16.out b/tests/expectations/parser/expression/literal/int_parse/u16.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/u16.out rename to tests/expectations/parser/expression/literal/int_parse/u16.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u32.out b/tests/expectations/parser/expression/literal/int_parse/u32.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/u32.out rename to tests/expectations/parser/expression/literal/int_parse/u32.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u64.out b/tests/expectations/parser/expression/literal/int_parse/u64.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/u64.out rename to tests/expectations/parser/expression/literal/int_parse/u64.out diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u8.out b/tests/expectations/parser/expression/literal/int_parse/u8.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/int_parse/u8.out rename to tests/expectations/parser/expression/literal/int_parse/u8.out diff --git a/tests/expectations/parser/parser/expression/literal/postfix_types.out b/tests/expectations/parser/expression/literal/postfix_types.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/postfix_types.out rename to tests/expectations/parser/expression/literal/postfix_types.out diff --git a/tests/expectations/parser/parser/expression/literal/string.out b/tests/expectations/parser/expression/literal/string.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/string.out rename to tests/expectations/parser/expression/literal/string.out diff --git a/tests/expectations/parser/parser/expression/literal/string_fail.out b/tests/expectations/parser/expression/literal/string_fail.out similarity index 100% rename from tests/expectations/parser/parser/expression/literal/string_fail.out rename to tests/expectations/parser/expression/literal/string_fail.out diff --git a/tests/expectations/parser/parser/expression/ternary.out b/tests/expectations/parser/expression/ternary.out similarity index 100% rename from tests/expectations/parser/parser/expression/ternary.out rename to tests/expectations/parser/expression/ternary.out diff --git a/tests/expectations/parser/parser/expression/token_format.out b/tests/expectations/parser/expression/token_format.out similarity index 100% rename from tests/expectations/parser/parser/expression/token_format.out rename to tests/expectations/parser/expression/token_format.out diff --git a/tests/expectations/parser/parser/expression/unary/abs.out b/tests/expectations/parser/expression/unary/abs.out similarity index 100% rename from tests/expectations/parser/parser/expression/unary/abs.out rename to tests/expectations/parser/expression/unary/abs.out diff --git a/tests/expectations/parser/parser/expression/unary/abs_wrapped.out b/tests/expectations/parser/expression/unary/abs_wrapped.out similarity index 100% rename from tests/expectations/parser/parser/expression/unary/abs_wrapped.out rename to tests/expectations/parser/expression/unary/abs_wrapped.out diff --git a/tests/expectations/parser/parser/expression/unary/double.out b/tests/expectations/parser/expression/unary/double.out similarity index 100% rename from tests/expectations/parser/parser/expression/unary/double.out rename to tests/expectations/parser/expression/unary/double.out diff --git a/tests/expectations/parser/parser/expression/unary/inv.out b/tests/expectations/parser/expression/unary/inv.out similarity index 100% rename from tests/expectations/parser/parser/expression/unary/inv.out rename to tests/expectations/parser/expression/unary/inv.out diff --git a/tests/expectations/parser/parser/expression/unary/neg.out b/tests/expectations/parser/expression/unary/neg.out similarity index 100% rename from tests/expectations/parser/parser/expression/unary/neg.out rename to tests/expectations/parser/expression/unary/neg.out diff --git a/tests/expectations/parser/parser/expression/unary/not.out b/tests/expectations/parser/expression/unary/not.out similarity index 100% rename from tests/expectations/parser/parser/expression/unary/not.out rename to tests/expectations/parser/expression/unary/not.out diff --git a/tests/expectations/parser/parser/expression/unary/sqrt.out b/tests/expectations/parser/expression/unary/sqrt.out similarity index 100% rename from tests/expectations/parser/parser/expression/unary/sqrt.out rename to tests/expectations/parser/expression/unary/sqrt.out diff --git a/tests/expectations/parser/parser/expression/unary/square.out b/tests/expectations/parser/expression/unary/square.out similarity index 100% rename from tests/expectations/parser/parser/expression/unary/square.out rename to tests/expectations/parser/expression/unary/square.out diff --git a/tests/expectations/parser/parser/functions/annotated_arg_not_ident.out b/tests/expectations/parser/functions/annotated_arg_not_ident.out similarity index 100% rename from tests/expectations/parser/parser/functions/annotated_arg_not_ident.out rename to tests/expectations/parser/functions/annotated_arg_not_ident.out diff --git a/tests/expectations/parser/parser/functions/annotated_context_fail.out b/tests/expectations/parser/functions/annotated_context_fail.out similarity index 100% rename from tests/expectations/parser/parser/functions/annotated_context_fail.out rename to tests/expectations/parser/functions/annotated_context_fail.out diff --git a/tests/expectations/parser/parser/functions/bounded_recursion.out b/tests/expectations/parser/functions/bounded_recursion.out similarity index 100% rename from tests/expectations/parser/parser/functions/bounded_recursion.out rename to tests/expectations/parser/functions/bounded_recursion.out diff --git a/tests/expectations/parser/parser/functions/const_input.out b/tests/expectations/parser/functions/const_input.out similarity index 100% rename from tests/expectations/parser/parser/functions/const_input.out rename to tests/expectations/parser/functions/const_input.out diff --git a/tests/expectations/parser/parser/functions/const_param.out b/tests/expectations/parser/functions/const_param.out similarity index 100% rename from tests/expectations/parser/parser/functions/const_param.out rename to tests/expectations/parser/functions/const_param.out diff --git a/tests/expectations/parser/parser/functions/const_public_param_fail.out b/tests/expectations/parser/functions/const_public_param_fail.out similarity index 100% rename from tests/expectations/parser/parser/functions/const_public_param_fail.out rename to tests/expectations/parser/functions/const_public_param_fail.out diff --git a/tests/expectations/parser/parser/functions/empty2.out b/tests/expectations/parser/functions/empty2.out similarity index 100% rename from tests/expectations/parser/parser/functions/empty2.out rename to tests/expectations/parser/functions/empty2.out diff --git a/tests/expectations/parser/parser/functions/escape_fail.out b/tests/expectations/parser/functions/escape_fail.out similarity index 100% rename from tests/expectations/parser/parser/functions/escape_fail.out rename to tests/expectations/parser/functions/escape_fail.out diff --git a/tests/expectations/parser/parser/functions/ident_token_fail.out b/tests/expectations/parser/functions/ident_token_fail.out similarity index 100% rename from tests/expectations/parser/parser/functions/ident_token_fail.out rename to tests/expectations/parser/functions/ident_token_fail.out diff --git a/tests/expectations/parser/parser/functions/infinite_recursion.out b/tests/expectations/parser/functions/infinite_recursion.out similarity index 100% rename from tests/expectations/parser/parser/functions/infinite_recursion.out rename to tests/expectations/parser/functions/infinite_recursion.out diff --git a/tests/expectations/parser/parser/functions/mut_input_fail.out b/tests/expectations/parser/functions/mut_input_fail.out similarity index 100% rename from tests/expectations/parser/parser/functions/mut_input_fail.out rename to tests/expectations/parser/functions/mut_input_fail.out diff --git a/tests/expectations/parser/parser/functions/params.out b/tests/expectations/parser/functions/params.out similarity index 100% rename from tests/expectations/parser/parser/functions/params.out rename to tests/expectations/parser/functions/params.out diff --git a/tests/expectations/parser/parser/functions/params_return.out b/tests/expectations/parser/functions/params_return.out similarity index 100% rename from tests/expectations/parser/parser/functions/params_return.out rename to tests/expectations/parser/functions/params_return.out diff --git a/tests/expectations/parser/parser/functions/public_const_param_fail.out b/tests/expectations/parser/functions/public_const_param_fail.out similarity index 100% rename from tests/expectations/parser/parser/functions/public_const_param_fail.out rename to tests/expectations/parser/functions/public_const_param_fail.out diff --git a/tests/expectations/parser/parser/functions/public_param.out b/tests/expectations/parser/functions/public_param.out similarity index 100% rename from tests/expectations/parser/parser/functions/public_param.out rename to tests/expectations/parser/functions/public_param.out diff --git a/tests/expectations/parser/parser/functions/return.out b/tests/expectations/parser/functions/return.out similarity index 100% rename from tests/expectations/parser/parser/functions/return.out rename to tests/expectations/parser/functions/return.out diff --git a/tests/expectations/parser/parser/functions/test_keyword_fail.out b/tests/expectations/parser/functions/test_keyword_fail.out similarity index 100% rename from tests/expectations/parser/parser/functions/test_keyword_fail.out rename to tests/expectations/parser/functions/test_keyword_fail.out diff --git a/tests/expectations/parser/parser/inputs/input_const.out b/tests/expectations/parser/inputs/input_const.out similarity index 100% rename from tests/expectations/parser/parser/inputs/input_const.out rename to tests/expectations/parser/inputs/input_const.out diff --git a/tests/expectations/parser/parser/inputs/input_constant.out b/tests/expectations/parser/inputs/input_constant.out similarity index 100% rename from tests/expectations/parser/parser/inputs/input_constant.out rename to tests/expectations/parser/inputs/input_constant.out diff --git a/tests/expectations/parser/parser/inputs/input_constant_public_fail.out b/tests/expectations/parser/inputs/input_constant_public_fail.out similarity index 100% rename from tests/expectations/parser/parser/inputs/input_constant_public_fail.out rename to tests/expectations/parser/inputs/input_constant_public_fail.out diff --git a/tests/expectations/parser/parser/inputs/input_fail.out b/tests/expectations/parser/inputs/input_fail.out similarity index 100% rename from tests/expectations/parser/parser/inputs/input_fail.out rename to tests/expectations/parser/inputs/input_fail.out diff --git a/tests/expectations/parser/parser/inputs/input_public.out b/tests/expectations/parser/inputs/input_public.out similarity index 100% rename from tests/expectations/parser/parser/inputs/input_public.out rename to tests/expectations/parser/inputs/input_public.out diff --git a/tests/expectations/parser/parser/inputs/input_public_constant_fail.out b/tests/expectations/parser/inputs/input_public_constant_fail.out similarity index 100% rename from tests/expectations/parser/parser/inputs/input_public_constant_fail.out rename to tests/expectations/parser/inputs/input_public_constant_fail.out diff --git a/tests/expectations/parser/parser/program/backslash_eof.out b/tests/expectations/parser/program/backslash_eof.out similarity index 100% rename from tests/expectations/parser/parser/program/backslash_eof.out rename to tests/expectations/parser/program/backslash_eof.out diff --git a/tests/expectations/parser/parser/program/bidi_comment_2_fail.out b/tests/expectations/parser/program/bidi_comment_2_fail.out similarity index 100% rename from tests/expectations/parser/parser/program/bidi_comment_2_fail.out rename to tests/expectations/parser/program/bidi_comment_2_fail.out diff --git a/tests/expectations/parser/parser/program/bidi_comment_fail.out b/tests/expectations/parser/program/bidi_comment_fail.out similarity index 100% rename from tests/expectations/parser/parser/program/bidi_comment_fail.out rename to tests/expectations/parser/program/bidi_comment_fail.out diff --git a/tests/expectations/parser/parser/program/dollar_eof.out b/tests/expectations/parser/program/dollar_eof.out similarity index 100% rename from tests/expectations/parser/parser/program/dollar_eof.out rename to tests/expectations/parser/program/dollar_eof.out diff --git a/tests/expectations/parser/parser/program/escape_u8_eof.out b/tests/expectations/parser/program/escape_u8_eof.out similarity index 100% rename from tests/expectations/parser/parser/program/escape_u8_eof.out rename to tests/expectations/parser/program/escape_u8_eof.out diff --git a/tests/expectations/parser/parser/program/hex_eof.out b/tests/expectations/parser/program/hex_eof.out similarity index 100% rename from tests/expectations/parser/parser/program/hex_eof.out rename to tests/expectations/parser/program/hex_eof.out diff --git a/tests/expectations/parser/parser/program/pipe_eof.out b/tests/expectations/parser/program/pipe_eof.out similarity index 100% rename from tests/expectations/parser/parser/program/pipe_eof.out rename to tests/expectations/parser/program/pipe_eof.out diff --git a/tests/expectations/parser/parser/program/q_eof.out b/tests/expectations/parser/program/q_eof.out similarity index 100% rename from tests/expectations/parser/parser/program/q_eof.out rename to tests/expectations/parser/program/q_eof.out diff --git a/tests/expectations/parser/parser/program/sq_eof.out b/tests/expectations/parser/program/sq_eof.out similarity index 100% rename from tests/expectations/parser/parser/program/sq_eof.out rename to tests/expectations/parser/program/sq_eof.out diff --git a/tests/expectations/parser/parser/program/tilde_eof.out b/tests/expectations/parser/program/tilde_eof.out similarity index 100% rename from tests/expectations/parser/parser/program/tilde_eof.out rename to tests/expectations/parser/program/tilde_eof.out diff --git a/tests/expectations/parser/parser/program/unclosed_unicode_eof_fail.out b/tests/expectations/parser/program/unclosed_unicode_eof_fail.out similarity index 100% rename from tests/expectations/parser/parser/program/unclosed_unicode_eof_fail.out rename to tests/expectations/parser/program/unclosed_unicode_eof_fail.out diff --git a/tests/expectations/parser/parser/serialize/one_plus_one.out b/tests/expectations/parser/serialize/one_plus_one.out similarity index 100% rename from tests/expectations/parser/parser/serialize/one_plus_one.out rename to tests/expectations/parser/serialize/one_plus_one.out diff --git a/tests/expectations/parser/parser/serialize/parser_error.out b/tests/expectations/parser/serialize/parser_error.out similarity index 100% rename from tests/expectations/parser/parser/serialize/parser_error.out rename to tests/expectations/parser/serialize/parser_error.out diff --git a/tests/expectations/parser/parser/statement/assign.out b/tests/expectations/parser/statement/assign.out similarity index 100% rename from tests/expectations/parser/parser/statement/assign.out rename to tests/expectations/parser/statement/assign.out diff --git a/tests/expectations/parser/parser/statement/block.out b/tests/expectations/parser/statement/block.out similarity index 100% rename from tests/expectations/parser/parser/statement/block.out rename to tests/expectations/parser/statement/block.out diff --git a/tests/expectations/parser/parser/statement/conditional.out b/tests/expectations/parser/statement/conditional.out similarity index 100% rename from tests/expectations/parser/parser/statement/conditional.out rename to tests/expectations/parser/statement/conditional.out diff --git a/tests/expectations/parser/parser/statement/conditional_fail.out b/tests/expectations/parser/statement/conditional_fail.out similarity index 100% rename from tests/expectations/parser/parser/statement/conditional_fail.out rename to tests/expectations/parser/statement/conditional_fail.out diff --git a/tests/expectations/parser/parser/statement/console.out b/tests/expectations/parser/statement/console.out similarity index 100% rename from tests/expectations/parser/parser/statement/console.out rename to tests/expectations/parser/statement/console.out diff --git a/tests/expectations/parser/parser/statement/console_fail.out b/tests/expectations/parser/statement/console_fail.out similarity index 100% rename from tests/expectations/parser/parser/statement/console_fail.out rename to tests/expectations/parser/statement/console_fail.out diff --git a/tests/expectations/parser/parser/statement/definition.out b/tests/expectations/parser/statement/definition.out similarity index 100% rename from tests/expectations/parser/parser/statement/definition.out rename to tests/expectations/parser/statement/definition.out diff --git a/tests/expectations/parser/parser/statement/definition_fail.out b/tests/expectations/parser/statement/definition_fail.out similarity index 100% rename from tests/expectations/parser/parser/statement/definition_fail.out rename to tests/expectations/parser/statement/definition_fail.out diff --git a/tests/expectations/parser/parser/statement/expression.out b/tests/expectations/parser/statement/expression.out similarity index 100% rename from tests/expectations/parser/parser/statement/expression.out rename to tests/expectations/parser/statement/expression.out diff --git a/tests/expectations/parser/parser/statement/expression_fail.out b/tests/expectations/parser/statement/expression_fail.out similarity index 100% rename from tests/expectations/parser/parser/statement/expression_fail.out rename to tests/expectations/parser/statement/expression_fail.out diff --git a/tests/expectations/parser/parser/statement/hex_int_fail.out b/tests/expectations/parser/statement/hex_int_fail.out similarity index 100% rename from tests/expectations/parser/parser/statement/hex_int_fail.out rename to tests/expectations/parser/statement/hex_int_fail.out diff --git a/tests/expectations/parser/parser/statement/iteration.out b/tests/expectations/parser/statement/iteration.out similarity index 100% rename from tests/expectations/parser/parser/statement/iteration.out rename to tests/expectations/parser/statement/iteration.out diff --git a/tests/expectations/parser/parser/statement/let_mut_recover.out b/tests/expectations/parser/statement/let_mut_recover.out similarity index 100% rename from tests/expectations/parser/parser/statement/let_mut_recover.out rename to tests/expectations/parser/statement/let_mut_recover.out diff --git a/tests/expectations/parser/parser/statement/return.out b/tests/expectations/parser/statement/return.out similarity index 100% rename from tests/expectations/parser/parser/statement/return.out rename to tests/expectations/parser/statement/return.out diff --git a/tests/expectations/parser/parser/statement/return_fail.out b/tests/expectations/parser/statement/return_fail.out similarity index 100% rename from tests/expectations/parser/parser/statement/return_fail.out rename to tests/expectations/parser/statement/return_fail.out diff --git a/tests/expectations/parser/parser/unreachable/define.out b/tests/expectations/parser/unreachable/define.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/define.out rename to tests/expectations/parser/unreachable/define.out diff --git a/tests/expectations/parser/parser/unreachable/eat_ident.out b/tests/expectations/parser/unreachable/eat_ident.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/eat_ident.out rename to tests/expectations/parser/unreachable/eat_ident.out diff --git a/tests/expectations/parser/parser/unreachable/eat_int.out b/tests/expectations/parser/unreachable/eat_int.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/eat_int.out rename to tests/expectations/parser/unreachable/eat_int.out diff --git a/tests/expectations/parser/parser/unreachable/equality_and_order_expression.out b/tests/expectations/parser/unreachable/equality_and_order_expression.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/equality_and_order_expression.out rename to tests/expectations/parser/unreachable/equality_and_order_expression.out diff --git a/tests/expectations/parser/parser/unreachable/expect_ident.out b/tests/expectations/parser/unreachable/expect_ident.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/expect_ident.out rename to tests/expectations/parser/unreachable/expect_ident.out diff --git a/tests/expectations/parser/parser/unreachable/math_op_fail.out b/tests/expectations/parser/unreachable/math_op_fail.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/math_op_fail.out rename to tests/expectations/parser/unreachable/math_op_fail.out diff --git a/tests/expectations/parser/parser/unreachable/math_op_pass.out b/tests/expectations/parser/unreachable/math_op_pass.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/math_op_pass.out rename to tests/expectations/parser/unreachable/math_op_pass.out diff --git a/tests/expectations/parser/parser/unreachable/postfix_fail.out b/tests/expectations/parser/unreachable/postfix_fail.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/postfix_fail.out rename to tests/expectations/parser/unreachable/postfix_fail.out diff --git a/tests/expectations/parser/parser/unreachable/postfix_pass.out b/tests/expectations/parser/unreachable/postfix_pass.out similarity index 100% rename from tests/expectations/parser/parser/unreachable/postfix_pass.out rename to tests/expectations/parser/unreachable/postfix_pass.out diff --git a/tests/test-framework/src/runner.rs b/tests/test-framework/src/runner.rs index a0af07f2f5..6cdc2a2cb2 100644 --- a/tests/test-framework/src/runner.rs +++ b/tests/test-framework/src/runner.rs @@ -156,12 +156,11 @@ impl TestCases { output } - fn load_expectations(&self, path: &Path, expectation_category: &str) -> (PathBuf, Option) { + fn load_expectations(&self, path: &Path) -> (PathBuf, Option) { let test_dir = [env!("CARGO_MANIFEST_DIR"), "../../tests/"].iter().collect::(); let relative_path = path.strip_prefix(&test_dir).expect("path error for test"); let expectation_path = test_dir .join("expectations") - .join(expectation_category) .join(relative_path.parent().expect("no parent dir for test")) .join(relative_path.file_name().expect("no file name for test")) .with_extension("out"); @@ -196,7 +195,7 @@ pub fn run_tests(runner: &T, expectation_category: &str) { None => return, }; - let (expectation_path, expectations) = cases.load_expectations(path, expectation_category); + let (expectation_path, expectations) = cases.load_expectations(path); let tests = match namespace.parse_type() { ParseType::Line => crate::fetch::split_tests_one_line(content)