diff --git a/compiler/mono/src/decision_tree.rs b/compiler/mono/src/decision_tree.rs index ef6a508c54..cb4c0f1c6f 100644 --- a/compiler/mono/src/decision_tree.rs +++ b/compiler/mono/src/decision_tree.rs @@ -1217,13 +1217,7 @@ fn test_to_equality<'a>( cond_layout: &Layout<'a>, path: &[PathInstruction], test: Test<'a>, -) -> ( - StoresVec<'a>, - Symbol, - Symbol, - Layout<'a>, - Option>, -) { +) -> (StoresVec<'a>, Symbol, Symbol, Option>) { let (rhs_symbol, mut stores, test_layout) = path_to_expr_help(env, cond_symbol, &path, *cond_layout); @@ -1255,7 +1249,6 @@ fn test_to_equality<'a>( stores, lhs_symbol, rhs_symbol, - Layout::Builtin(Builtin::Int64), Some(ConstructorKnown::OnlyPass { scrutinee: path_symbol, layout: *cond_layout, @@ -1273,13 +1266,7 @@ fn test_to_equality<'a>( let lhs_symbol = env.unique_symbol(); stores.push((lhs_symbol, Layout::Builtin(Builtin::Int64), lhs)); - ( - stores, - lhs_symbol, - rhs_symbol, - Layout::Builtin(Builtin::Int64), - None, - ) + (stores, lhs_symbol, rhs_symbol, None) } Test::IsFloat(test_int) => { @@ -1289,13 +1276,7 @@ fn test_to_equality<'a>( let lhs_symbol = env.unique_symbol(); stores.push((lhs_symbol, Layout::Builtin(Builtin::Float64), lhs)); - ( - stores, - lhs_symbol, - rhs_symbol, - Layout::Builtin(Builtin::Float64), - None, - ) + (stores, lhs_symbol, rhs_symbol, None) } Test::IsByte { @@ -1305,13 +1286,7 @@ fn test_to_equality<'a>( let lhs_symbol = env.unique_symbol(); stores.push((lhs_symbol, Layout::Builtin(Builtin::Int8), lhs)); - ( - stores, - lhs_symbol, - rhs_symbol, - Layout::Builtin(Builtin::Int8), - None, - ) + (stores, lhs_symbol, rhs_symbol, None) } Test::IsBit(test_bit) => { @@ -1319,13 +1294,7 @@ fn test_to_equality<'a>( let lhs_symbol = env.unique_symbol(); stores.push((lhs_symbol, Layout::Builtin(Builtin::Int1), lhs)); - ( - stores, - lhs_symbol, - rhs_symbol, - Layout::Builtin(Builtin::Int1), - None, - ) + (stores, lhs_symbol, rhs_symbol, None) } Test::IsStr(test_str) => { @@ -1334,13 +1303,7 @@ fn test_to_equality<'a>( stores.push((lhs_symbol, Layout::Builtin(Builtin::Str), lhs)); - ( - stores, - lhs_symbol, - rhs_symbol, - Layout::Builtin(Builtin::Str), - None, - ) + (stores, lhs_symbol, rhs_symbol, None) } } } @@ -1349,7 +1312,6 @@ type Tests<'a> = std::vec::Vec<( bumpalo::collections::Vec<'a, (Symbol, Layout<'a>, Expr<'a>)>, Symbol, Symbol, - Layout<'a>, Option>, )>; @@ -1495,7 +1457,7 @@ fn compile_tests<'a>( fail: &'a Stmt<'a>, mut cond: Stmt<'a>, ) -> Stmt<'a> { - for (new_stores, lhs, rhs, _layout, opt_constructor_info) in tests.into_iter() { + for (new_stores, lhs, rhs, opt_constructor_info) in tests.into_iter() { match opt_constructor_info { None => { cond = compile_test(env, ret_layout, new_stores, lhs, rhs, fail, cond); @@ -1684,7 +1646,7 @@ fn decide_to_branching<'a>( if number_of_tests == 1 { // if there is just one test, compile to a simple if-then-else - let (new_stores, lhs, rhs, _layout, _cinfo) = tests.into_iter().next().unwrap(); + let (new_stores, lhs, rhs, _cinfo) = tests.into_iter().next().unwrap(); compile_test_help( env,