Clean up

Author: tiif

crates/formality-check/src/mini_rust_check.rs

@@ -342,7 +342,6 @@ impl Check<'_> {
                     .unwrap();
 
                 // Find the callee from current crate.
-                // FIXME: get the information from decl too
                 let callee = curr_crate.items.iter().find(|item| {
                     match item {
                         CrateItem::Fn(fn_declared) => {

crates/formality-rust/src/grammar/minirust.rs

@@ -141,10 +141,7 @@ pub enum ValueExpression {
     Constant(ConstTypePair),
     #[grammar(fn_id $v0)]
     Fn(FnId),
-    // FIXME: minirust uses typle to represent  arrays, structs, tuples (including unit).
-    // But I think it will be quite annoying to do typecking when we have all these types
-    // together, so I added a variant just for struct.
-    #[grammar(struct ${v0} as $v1)] // FIXME: use comma separated
+    #[grammar(struct {$,v0} as $v1)]
     Struct(Vec<ValueExpression>, Ty),
     // Union
     // Variant

src/test/mir_fn_bodies.rs

@@ -262,6 +262,7 @@ fn test_struct() {
             crate Foo {
                 struct Dummy {
                     value: u32,
+                    is_true: bool,
                 }
 
                 fn foo (u32) -> u32 = minirust(v1) -> v0 {
@@ -272,7 +273,7 @@ fn test_struct() {
                     bb0: {
                         statements {
                             local(v0) = load(local(v1));
-                            local(v2) = struct { constant(1: u32) } as Dummy;
+                            local(v2) = struct { constant(1: u32), constant(false)} as Dummy;
                             local(v2).0 = constant(2: u32);
                         }
                         return;