Update references from checking2 to checking

Author: purefunctor

.agents/skills/type-checker-tests/SKILL.md

@@ -1,12 +1,12 @@
 ---
 name: type-checker-tests
-description: Add integration tests for type checker inference and checking2 functions
+description: Add integration tests for type checker inference and checking functions
 allowed-tools: Bash(mkdir:*)
 ---
 
 # Type Checker Integration Tests
 
-Use the command reference at `reference/compiler-scripts.md` for test runner syntax, snapshot workflows, filters, and trace debugging. The category is `checking2`.
+Use the command reference at `reference/compiler-scripts.md` for test runner syntax, snapshot workflows, filters, and trace debugging. The category is `checking`.
 
 **Language:** Fixtures use PureScript syntax, not Haskell.
 
@@ -15,7 +15,7 @@ Use the command reference at `reference/compiler-scripts.md` for test runner syn
 ### 1. Create fixture directory
 
 ```bash
-just t checking2 --create "descriptive name"
+just t checking --create "descriptive name"
 ```
 
 The CLI picks the next fixture number and creates the folder.
@@ -24,7 +24,7 @@ Tests are auto-discovered by `build.rs`.
 
 ### 2. Write Main.purs
 
-**Standard pattern** - pair typed (checking2) and untyped (inference) variants:
+**Standard pattern** - pair typed (checking) and untyped (inference) variants:
 
 ```purescript
 module Main where
@@ -45,24 +45,24 @@ test' [x] = x
 ### 3. Run and review
 
 ```bash
-just t checking2 NNN MMM
+just t checking NNN MMM
 ```
 
 ### 4. Accept or reject snapshots
 
 ```bash
-just t checking2 NNN --diff        # Inspect a fixture diff
-just t checking2 NNN --accept      # Accept a specific fixture
-just t checking2 NNN --reject      # Reject a specific fixture
-just t checking2 --accept --confirm # Accept all pending snapshots
+just t checking NNN --diff        # Inspect a fixture diff
+just t checking NNN --accept      # Accept a specific fixture
+just t checking NNN --reject      # Reject a specific fixture
+just t checking --accept --confirm # Accept all pending snapshots
 ```
 
 ## Multi-File Tests
 
 For imports, re-exports, or cross-module behavior:
 
 ```
-tests-integration/fixtures/checking2/NNN_import_test/
+tests-integration/fixtures/checking/NNN_import_test/
 ├── Main.purs    # Test file (snapshot generated)
 ├── Lib.purs     # Supporting module
 └── Main.snap    # Generated snapshot

Cargo.lock

@@ -51,7 +51,7 @@ pub fn start(config: Arc<cli::Config>) {
     let fmt_filter = filter::Targets::new()
         .with_target("building::engine", config.query_log)
         .with_target("purescript_analyzer::lsp", config.lsp_log)
-        .with_target("checking2", config.checking_log)
+        .with_target("checking", config.checking_log)
         .with_default(LevelFilter::INFO);
     let fmt = fmt::layer().with_writer(file).with_filter(fmt_filter);
 

compiler-bin/src/logging.rs

@@ -18,7 +18,7 @@ pub enum QueryKey {
     Resolved(FileId),
     Bracketed(FileId),
     Sectioned(FileId),
-    Checked2(FileId),
+    Checked(FileId),
 }
 
 #[derive(Error, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]

compiler-core/building-types/src/lib.rs

@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 building-types = { version = "0.1.0", path = "../building-types" }
-checking2 = { version = "0.1.0", path = "../checking2" }
+checking = { version = "0.1.0", path = "../checking" }
 files = { version = "0.1.0", path = "../files" }
 indexing = { version = "0.1.0", path = "../indexing" }
 interner = { version = "0.1.0", path = "../interner" }

compiler-core/building/Cargo.toml

@@ -33,7 +33,7 @@ use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering};
 use building_types::{
     ModuleNameId, ModuleNameInterner, QueryError, QueryKey, QueryProxy, QueryResult,
 };
-use checking2::CheckedModule as CheckedModule2;
+use checking::CheckedModule;
 use files::FileId;
 use graph::SnapshotGraph;
 use indexing::IndexedModule;
@@ -98,13 +98,13 @@ struct DerivedStorage {
     resolved: FxHashMap<FileId, DerivedState<Arc<ResolvedModule>>>,
     bracketed: FxHashMap<FileId, DerivedState<Arc<sugar::Bracketed>>>,
     sectioned: FxHashMap<FileId, DerivedState<Arc<sugar::Sectioned>>>,
-    checked2: FxHashMap<FileId, DerivedState<Arc<CheckedModule2>>>,
+    checked: FxHashMap<FileId, DerivedState<Arc<CheckedModule>>>,
 }
 
 #[derive(Default)]
 struct InternedStorage {
     module: ModuleNameInterner,
-    checking2: checking2::CoreInterners,
+    checking: checking::CoreInterners,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -427,7 +427,7 @@ impl QueryEngine {
                 QueryKey::Resolved(k) => derived_changed!(resolved, k),
                 QueryKey::Bracketed(k) => derived_changed!(bracketed, k),
                 QueryKey::Sectioned(k) => derived_changed!(sectioned, k),
-                QueryKey::Checked2(k) => derived_changed!(checked2, k),
+                QueryKey::Checked(k) => derived_changed!(checked, k),
             }
         }
 
@@ -746,13 +746,13 @@ impl QueryEngine {
         )
     }
 
-    pub fn checked2(&self, id: FileId) -> QueryResult<Arc<CheckedModule2>> {
+    pub fn checked(&self, id: FileId) -> QueryResult<Arc<CheckedModule>> {
         self.query(
-            QueryKey::Checked2(id),
-            |storage| storage.derived.checked2.get(&id),
-            |storage| storage.derived.checked2.entry(id),
+            QueryKey::Checked(id),
+            |storage| storage.derived.checked.get(&id),
+            |storage| storage.derived.checked.entry(id),
             |this| {
-                let checked = checking2::check_module(this, id)?;
+                let checked = checking::check_module(this, id)?;
                 Ok(Arc::new(checked))
             },
         )
@@ -823,55 +823,55 @@ impl QueryProxy for QueryEngine {
     }
 }
 
-impl checking2::ExternalQueries for QueryEngine {
-    fn checked2(&self, id: FileId) -> QueryResult<Arc<checking2::CheckedModule>> {
-        QueryEngine::checked2(self, id)
+impl checking::ExternalQueries for QueryEngine {
+    fn checked(&self, id: FileId) -> QueryResult<Arc<checking::CheckedModule>> {
+        QueryEngine::checked(self, id)
     }
 
-    fn intern_type(&self, t: checking2::core::Type) -> checking2::core::TypeId {
+    fn intern_type(&self, t: checking::core::Type) -> checking::core::TypeId {
         let mut storage = self.storage.write();
-        storage.interned.checking2.intern_type(t)
+        storage.interned.checking.intern_type(t)
     }
 
-    fn lookup_type(&self, id: checking2::core::TypeId) -> checking2::core::Type {
+    fn lookup_type(&self, id: checking::core::TypeId) -> checking::core::Type {
         let storage = self.storage.read();
-        storage.interned.checking2.lookup_type(id)
+        storage.interned.checking.lookup_type(id)
     }
 
     fn intern_forall_binder(
         &self,
-        binder: checking2::core::ForallBinder,
-    ) -> checking2::core::ForallBinderId {
+        binder: checking::core::ForallBinder,
+    ) -> checking::core::ForallBinderId {
         let mut storage = self.storage.write();
-        storage.interned.checking2.intern_forall_binder(binder)
+        storage.interned.checking.intern_forall_binder(binder)
     }
 
     fn lookup_forall_binder(
         &self,
-        id: checking2::core::ForallBinderId,
-    ) -> checking2::core::ForallBinder {
+        id: checking::core::ForallBinderId,
+    ) -> checking::core::ForallBinder {
         let storage = self.storage.read();
-        storage.interned.checking2.lookup_forall_binder(id)
+        storage.interned.checking.lookup_forall_binder(id)
     }
 
-    fn intern_row_type(&self, row: checking2::core::RowType) -> checking2::core::RowTypeId {
+    fn intern_row_type(&self, row: checking::core::RowType) -> checking::core::RowTypeId {
         let mut storage = self.storage.write();
-        storage.interned.checking2.intern_row_type(row)
+        storage.interned.checking.intern_row_type(row)
     }
 
-    fn lookup_row_type(&self, id: checking2::core::RowTypeId) -> checking2::core::RowType {
+    fn lookup_row_type(&self, id: checking::core::RowTypeId) -> checking::core::RowType {
         let storage = self.storage.read();
-        storage.interned.checking2.lookup_row_type(id)
+        storage.interned.checking.lookup_row_type(id)
     }
 
-    fn intern_smol_str(&self, s: smol_str::SmolStr) -> checking2::core::SmolStrId {
+    fn intern_smol_str(&self, s: smol_str::SmolStr) -> checking::core::SmolStrId {
         let mut storage = self.storage.write();
-        storage.interned.checking2.intern_smol_str(s)
+        storage.interned.checking.intern_smol_str(s)
     }
 
-    fn lookup_smol_str(&self, id: checking2::core::SmolStrId) -> smol_str::SmolStr {
+    fn lookup_smol_str(&self, id: checking::core::SmolStrId) -> smol_str::SmolStr {
         let storage = self.storage.read();
-        storage.interned.checking2.lookup_smol_str(id)
+        storage.interned.checking.lookup_smol_str(id)
     }
 }
 

compiler-core/building/src/engine.rs

@@ -1,5 +1,5 @@
 [package]
-name = "checking2"
+name = "checking"
 version = "0.1.0"
 edition = "2024"
 

compiler-core/checking/Cargo.toml

@@ -59,7 +59,7 @@ where
                 application.item_id,
             );
         } else {
-            let checked = context.queries.checked2(file_id)?;
+            let checked = context.queries.checked(file_id)?;
             let indexed = context.queries.indexed(file_id)?;
             collect_instances_from_checked(
                 &mut instances,

compiler-core/checking/src/core/constraint/instances.rs

@@ -967,7 +967,7 @@ where
     let constructor_type = if file_id == context.id {
         state.checked.lookup_term(term_id)
     } else {
-        let checked = context.queries.checked2(file_id)?;
+        let checked = context.queries.checked(file_id)?;
         checked.lookup_term(term_id)
     };
 

compiler-core/checking/src/core/exhaustive.rs

@@ -136,7 +136,7 @@ where
     let kind = if file_id == context.id {
         state.checked.lookup_type(type_id)
     } else {
-        let checked = context.queries.checked2(file_id)?;
+        let checked = context.queries.checked(file_id)?;
         checked.lookup_type(type_id)
     };
 
@@ -155,7 +155,7 @@ where
     let term = if file_id == context.id {
         state.checked.lookup_term(term_id)
     } else {
-        let checked = context.queries.checked2(file_id)?;
+        let checked = context.queries.checked(file_id)?;
         checked.lookup_term(term_id)
     };
 
@@ -204,7 +204,7 @@ where
     if file_id == context.id {
         Ok(state.checked.lookup_class(item_id))
     } else {
-        let checked = context.queries.checked2(file_id)?;
+        let checked = context.queries.checked(file_id)?;
         Ok(checked.lookup_class(item_id))
     }
 }
@@ -221,7 +221,7 @@ where
     if file_id == context.id {
         Ok(state.checked.lookup_synonym(type_id))
     } else {
-        let checked = context.queries.checked2(file_id)?;
+        let checked = context.queries.checked(file_id)?;
         Ok(checked.lookup_synonym(type_id))
     }
 }
@@ -238,7 +238,7 @@ where
     let operator_kind = if file_id == context.id {
         state.checked.lookup_type(type_id)
     } else {
-        let checked = context.queries.checked2(file_id)?;
+        let checked = context.queries.checked(file_id)?;
         checked.lookup_type(type_id)
     };
 
@@ -284,7 +284,7 @@ where
     let operator_type = if file_id == context.id {
         state.checked.lookup_term(term_id)
     } else {
-        let checked = context.queries.checked2(file_id)?;
+        let checked = context.queries.checked(file_id)?;
         checked.lookup_term(term_id)
     };
 
@@ -602,7 +602,7 @@ where
     if file_id == context.id {
         Ok(state.checked.lookup_roles(item_id))
     } else {
-        let checked = context.queries.checked2(file_id)?;
+        let checked = context.queries.checked(file_id)?;
         Ok(checked.lookup_roles(item_id))
     }
 }