Merge acdc607 into 2ca2e5c

noir-lang · Sep 4, 2024 · a17c9dc · a17c9dc
2 parents 2ca2e5c + acdc607
commit a17c9dc
Show file tree

Hide file tree

Showing 7 changed files with 272 additions and 165 deletions.
diff --git a/compiler/noirc_frontend/src/elaborator/comptime.rs b/compiler/noirc_frontend/src/elaborator/comptime.rs
@@ -385,14 +385,30 @@ impl<'context> Elaborator<'context> {
                     self.errors.push(error);
                 }
             }
+            TopLevelStatement::Struct(struct_def) => {
+                if let Some((type_id, the_struct)) = dc_mod::collect_struct(
+                    self.interner,
+                    self.def_maps.get_mut(&self.crate_id).unwrap(),
+                    struct_def,
+                    self.file,
+                    self.local_module,
+                    self.crate_id,
+                    &mut self.errors,
+                ) {
+                    generated_items.types.insert(type_id, the_struct);
+                }
+            }
+            TopLevelStatement::Impl(r#impl) => {
+                let module = self.module_id();
+                dc_mod::collect_impl(self.interner, generated_items, r#impl, self.file, module);
+            }
+
             // Assume that an error has already been issued
             TopLevelStatement::Error => (),
 
             TopLevelStatement::Module(_)
             | TopLevelStatement::Import(..)
-            | TopLevelStatement::Struct(_)
             | TopLevelStatement::Trait(_)
-            | TopLevelStatement::Impl(_)
             | TopLevelStatement::TypeAlias(_)
             | TopLevelStatement::SubModule(_)
             | TopLevelStatement::InnerAttribute(_) => {

diff --git a/compiler/noirc_frontend/src/hir/comptime/errors.rs b/compiler/noirc_frontend/src/hir/comptime/errors.rs
@@ -488,7 +488,7 @@ impl<'a> From<&'a InterpreterError> for CustomDiagnostic {
             InterpreterError::UnsupportedTopLevelItemUnquote { item, location } => {
                 let msg = "Unsupported statement type to unquote".into();
                 let secondary =
-                    "Only functions, globals, and trait impls can be unquoted here".into();
+                    "Only functions, structs, globals, and impls can be unquoted here".into();
                 let mut error = CustomDiagnostic::simple_error(msg, secondary, location.span);
                 error.add_note(format!("Unquoted item was:\n{item}"));
                 error