Merge branch 'master' of github.com:noir-lang/noir into jb-constructo…

…r-formatter

acvm-repo/acvm/src/compiler/transformers/fallback.rs

@@ -60,7 +60,11 @@ impl FallbackTransformer {
         }
 
         Ok((
-            Circuit { current_witness_index: witness_idx, opcodes: acir_supported_opcodes, ..acir },
+            Circuit {
+                current_witness_index: witness_idx - 1,
+                opcodes: acir_supported_opcodes,
+                ..acir
+            },
             new_opcode_positions,
         ))
     }

tooling/nargo_fmt/src/visitor/expr.rs

@@ -49,6 +49,10 @@ impl FmtVisitor<'_> {
                     .join(", ");
                 format!("{} {{ {} }}", type_str, formatted_fields)
             }
+            ExpressionKind::MemberAccess(member_access_expr) => {
+                let lhs_str = self.format_expr(member_access_expr.lhs);
+                format!("{}.{}", lhs_str, member_access_expr.rhs)
+            }
             ExpressionKind::Index(index_expr) => {
                 let formatted_collection =
                     self.format_expr(index_expr.collection).trim_end().to_string();

tooling/nargo_fmt/tests/expected/member_access.nr

@@ -0,0 +1,15 @@
+struct Address {
+    city: String,
+    country: String,
+}
+
+struct Person {
+    name: String,
+    age: u8,
+    address: Address,
+}
+
+fn foo(p: Person) {
+    p.name;
+    p.address.country;
+}

tooling/nargo_fmt/tests/input/member_access.nr

@@ -0,0 +1,15 @@
+struct Address {
+    city: String,
+    country: String,
+}
+
+struct Person {
+    name: String,
+    age: u8,
+    address: Address,
+}
+
+fn foo(p: Person) {
+    p   .   name;
+    p.address   .   country;
+}