merge conflicts after #3187 merged w/ master

noir-lang · Nov 3, 2023 · 1577442 · 1577442
2 parents 750f2ad + e026319
commit 1577442
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs b/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs
@@ -760,7 +760,6 @@ impl Context {
                 } else {
                     vec![]
                 };
-
                 let dummy = self.array_get_value(
                     &store_type,
                     block_id,

diff --git a/tooling/nargo_cli/tests/execution_success/slice_struct_field/src/main.nr b/tooling/nargo_cli/tests/execution_success/slice_struct_field/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std::println;
-
 struct FooParent {
     parent_arr: [Field; 3],
     foos: [Foo],
@@ -115,11 +113,8 @@ fn main(y : pub Field) {
 
     assert(foo_parents[y - 2].foos[y - 1].a == 7);
     foo_parents[y - 2].foos[y - 1].a = 50;
-    assert(foo_parents[y - 2].foos[y - 1].a == 50);
 
     let b_array = foo_parents[y - 2].foos[y - 1].b;
-    assert(b_array[0] == 8);
-    assert(b_array[1] == 9);
     assert(b_array[2] == 22);
     assert(b_array.len() == 3);