Address review comments

gleam-lang · Feb 26, 2025 · ac899bf · ac899bf
1 parent 16b4100
commit ac899bf
Show file tree

Hide file tree

Showing 15 changed files with 256 additions and 151 deletions.
diff --git a/compiler-core/generated/schema_capnp.rs b/compiler-core/generated/schema_capnp.rs
diff --git a/compiler-core/schema.capnp b/compiler-core/schema.capnp
@@ -53,6 +53,7 @@ struct Version {
 struct TypesVariantConstructors {
   variants @0 :List(TypeValueConstructor);
   typeParametersIds @1 :List(UInt16);
+  opaque @2 :Bool;
 }
 
 struct TypeValueConstructor {
@@ -77,7 +78,6 @@ struct TypeConstructor {
   deprecated @4 :Text;
   origin @5 :SrcSpan;
   documentation @6 :Text;
-  opaque @7 :Bool;
 }
 
 struct AccessorsMap {

diff --git a/compiler-core/src/analyse.rs b/compiler-core/src/analyse.rs
@@ -27,9 +27,10 @@ use crate::{
         fields::{FieldMap, FieldMapBuilder},
         hydrator::Hydrator,
         prelude::*,
-        AccessorsMap, Deprecation, ModuleInterface, PatternConstructor, RecordAccessor, Type,
-        TypeAliasConstructor, TypeConstructor, TypeValueConstructor, TypeValueConstructorField,
-        TypeVariantConstructors, ValueConstructor, ValueConstructorVariant, Warning,
+        AccessorsMap, Deprecation, ModuleInterface, Opaque, PatternConstructor, RecordAccessor,
+        Type, TypeAliasConstructor, TypeConstructor, TypeValueConstructor,
+        TypeValueConstructorField, TypeVariantConstructors, ValueConstructor,
+        ValueConstructorVariant, Warning,
     },
     uid::UniqueIdGenerator,
     warning::TypeWarningEmitter,
@@ -1108,10 +1109,15 @@ impl<'a, A> ModuleAnalyzer<'a, A> {
             );
         }
 
+        let opaque = if *opaque {
+            Opaque::Opaque
+        } else {
+            Opaque::NotOpaque
+        };
         // Now record the constructors for the type.
         environment.insert_type_to_constructors(
             name.clone(),
-            TypeVariantConstructors::new(constructors_data, type_parameters, hydrator),
+            TypeVariantConstructors::new(constructors_data, type_parameters, opaque, hydrator),
         );
 
         Ok(())
@@ -1185,7 +1191,6 @@ impl<'a, A> ModuleAnalyzer<'a, A> {
                     publicity,
                     type_,
                     documentation: documentation.as_ref().map(|(_, doc)| doc.clone()),
-                    opaque: *opaque,
                 },
             )
             .expect("name uniqueness checked above");
@@ -1260,7 +1265,6 @@ impl<'a, A> ModuleAnalyzer<'a, A> {
                     deprecation: deprecation.clone(),
                     publicity: *publicity,
                     documentation: documentation.as_ref().map(|(_, doc)| doc.clone()),
-                    opaque: false,
                 },
             )?;
 

diff --git a/compiler-core/src/build.rs b/compiler-core/src/build.rs
@@ -215,7 +215,7 @@ fn mode_includes_tests() {
 pub struct Package {
     pub config: PackageConfig,
     pub modules: Vec<Module>,
-    pub module_names: Vec<EcoString>,
+    pub cached_module_names: Vec<EcoString>,
 }
 
 impl Package {