From 46bd44bd99e0b89fc2eabdf541f8a101c12072f9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 20 Jul 2024 18:30:05 -0500 Subject: [PATCH] cl-typeck: Re-name mod key to mod handle, in preparation for future handlization --- compiler/cl-typeck/src/definition.rs | 2 +- compiler/cl-typeck/src/{key.rs => handle.rs} | 0 compiler/cl-typeck/src/lib.rs | 2 +- compiler/cl-typeck/src/module.rs | 2 +- compiler/cl-typeck/src/name_collector.rs | 2 +- compiler/cl-typeck/src/project.rs | 2 +- compiler/cl-typeck/src/type_resolver.rs | 2 +- compiler/cl-typeck/src/use_importer.rs | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename compiler/cl-typeck/src/{key.rs => handle.rs} (100%) diff --git a/compiler/cl-typeck/src/definition.rs b/compiler/cl-typeck/src/definition.rs index cf0696a..5e6b172 100644 --- a/compiler/cl-typeck/src/definition.rs +++ b/compiler/cl-typeck/src/definition.rs @@ -1,5 +1,5 @@ use crate::{ - key::DefID, + handle::DefID, module::Module, node::{Node, NodeSource}, }; diff --git a/compiler/cl-typeck/src/key.rs b/compiler/cl-typeck/src/handle.rs similarity index 100% rename from compiler/cl-typeck/src/key.rs rename to compiler/cl-typeck/src/handle.rs diff --git a/compiler/cl-typeck/src/lib.rs b/compiler/cl-typeck/src/lib.rs index d3941de..756dd3b 100644 --- a/compiler/cl-typeck/src/lib.rs +++ b/compiler/cl-typeck/src/lib.rs @@ -67,7 +67,7 @@ Value: Either */ -pub mod key; +pub mod handle; pub mod node; diff --git a/compiler/cl-typeck/src/module.rs b/compiler/cl-typeck/src/module.rs index ebb6018..6caf65b 100644 --- a/compiler/cl-typeck/src/module.rs +++ b/compiler/cl-typeck/src/module.rs @@ -3,7 +3,7 @@ use cl_ast::Sym; use cl_structures::index_map::MapIndex; -use crate::key::DefID; +use crate::handle::DefID; use std::collections::HashMap; /// A [Module] is a node in the Module Tree (a component of a diff --git a/compiler/cl-typeck/src/name_collector.rs b/compiler/cl-typeck/src/name_collector.rs index f1c358d..6283e6c 100644 --- a/compiler/cl-typeck/src/name_collector.rs +++ b/compiler/cl-typeck/src/name_collector.rs @@ -1,7 +1,7 @@ //! Performs step 1 of type checking: Collecting all the names of things into [Module] units use crate::{ definition::{Def, DefKind}, - key::DefID, + handle::DefID, module::Module as Mod, node::{Node, NodeSource}, project::Project as Prj, diff --git a/compiler/cl-typeck/src/project.rs b/compiler/cl-typeck/src/project.rs index 58cdc08..23513f1 100644 --- a/compiler/cl-typeck/src/project.rs +++ b/compiler/cl-typeck/src/project.rs @@ -1,7 +1,7 @@ //! A [Project] contains a tree of [Def]initions, referred to by their [Path] use crate::{ definition::{Def, DefKind, TypeKind}, - key::DefID, + handle::DefID, module, node::{Node, NodeSource}, path::Path, diff --git a/compiler/cl-typeck/src/type_resolver.rs b/compiler/cl-typeck/src/type_resolver.rs index 65f2d5e..abf261d 100644 --- a/compiler/cl-typeck/src/type_resolver.rs +++ b/compiler/cl-typeck/src/type_resolver.rs @@ -2,7 +2,7 @@ use crate::{ definition::{Adt, Def, DefKind, TypeKind, ValueKind}, - key::DefID, + handle::DefID, node::{Node, NodeSource}, project::{evaluate::EvaluableTypeExpression, Project as Prj}, }; diff --git a/compiler/cl-typeck/src/use_importer.rs b/compiler/cl-typeck/src/use_importer.rs index 9e0cadd..ffb1f6c 100644 --- a/compiler/cl-typeck/src/use_importer.rs +++ b/compiler/cl-typeck/src/use_importer.rs @@ -15,7 +15,7 @@ use cl_ast::*; use crate::{ definition::{Def, DefKind}, - key::DefID, + handle::DefID, node::NodeSource, project::Project, };