merge hir-analysis crate into hir crate

.github/workflows/main.yml

@@ -74,7 +74,7 @@ jobs:
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v2
       - name: Check core crates for wasm32-unknown-unknown
-        run: cargo check -p fe-common -p fe-parser -p fe-hir -p fe-hir-analysis --target wasm32-unknown-unknown
+        run: cargo check -p fe-common -p fe-parser -p fe-hir --target wasm32-unknown-unknown
       - name: Check filesystem crates for wasm32-wasip1
         run: cargo check -p fe-driver -p fe-resolver -p fe --target wasm32-wasip1
 

Cargo.toml

@@ -9,7 +9,6 @@ edition = "2024"
 common = { path = "crates/common", package = "fe-common" }
 driver = { path = "crates/driver", package = "fe-driver" }
 hir = { path = "crates/hir", package = "fe-hir" }
-hir-analysis = { path = "crates/hir-analysis", package = "fe-hir-analysis" }
 parser = { path = "crates/parser", package = "fe-parser" }
 test-utils = { path = "crates/test-utils", package = "fe-test-utils" }
 resolver = { path = "crates/resolver", package = "fe-resolver" }

crates/driver/Cargo.toml

@@ -19,7 +19,6 @@ smol_str.workspace = true
 
 common.workspace = true
 hir.workspace = true
-hir-analysis.workspace = true
 resolver.workspace = true
 url.workspace = true
 tracing.workspace = true

crates/driver/src/db.rs

@@ -5,12 +5,7 @@ use codespan_reporting::term::{
 };
 use common::file::File;
 use common::{define_input_db, diagnostics::CompleteDiagnostic};
-use hir::{
-    Ingot,
-    hir_def::TopLevelMod,
-    lower::{map_file_to_mod, module_tree},
-};
-use hir_analysis::{
+use hir::analysis::{
     analysis_pass::{AnalysisPassManager, ParsingPass},
     diagnostics::DiagnosticVoucher,
     name_resolution::ImportAnalysisPass,
@@ -19,6 +14,11 @@ use hir_analysis::{
         ImplAnalysisPass, ImplTraitAnalysisPass, TraitAnalysisPass, TypeAliasAnalysisPass,
     },
 };
+use hir::{
+    Ingot,
+    hir_def::TopLevelMod,
+    lower::{map_file_to_mod, module_tree},
+};
 
 use crate::diagnostics::ToCsDiag;
 

crates/driver/src/diagnostics.rs

@@ -8,7 +8,7 @@ use common::{
     file::File,
 };
 use cs::{diagnostic as cs_diag, files as cs_files};
-use hir_analysis::diagnostics::{DiagnosticVoucher, SpannedHirAnalysisDb};
+use hir::analysis::diagnostics::{DiagnosticVoucher, SpannedHirAnalysisDb};
 
 pub trait ToCsDiag {
     fn to_cs(&self, db: &dyn SpannedInputDb) -> cs_diag::Diagnostic<File>;

crates/hir/Cargo.toml

@@ -10,17 +10,34 @@ description = "Provides HIR definition and lowering for Fe lang"
 doctest = false
 
 [dependencies]
+bitflags = "2.8"
 camino.workspace = true
 cranelift-entity = "0.115"
 derive_more.workspace = true
 dot2 = "1.0"
+either = "1.13"
+ena = { version = "0.14", features = ["persistent"] }
+indexmap = "2.0"
+itertools = "0.14"
 num-bigint.workspace = true
 num-traits = "0.2.19"
 paste.workspace = true
 rustc-hash.workspace = true
 salsa.workspace = true
+smallvec.workspace = true
+smallvec1.workspace = true
 thin-vec.workspace = true
+tracing.workspace = true
 
 common.workspace = true
 parser.workspace = true
+test-utils.workspace = true
 url.workspace = true
+
+[dev-dependencies]
+ascii_tree = "0.1"
+camino.workspace = true
+codespan-reporting.workspace = true
+dir-test.workspace = true
+driver.workspace = true
+test-utils.workspace = true

crates/hir-analysis/src/analysis_pass.rs → crates/hir/src/analysis/analysis_pass.rs

@@ -1,5 +1,5 @@
-use crate::{HirAnalysisDb, diagnostics::DiagnosticVoucher};
-use hir::{
+use crate::analysis::{HirAnalysisDb, diagnostics::DiagnosticVoucher};
+use crate::{
     ParserError,
     hir_def::{ModuleTree, TopLevelMod},
     lower::parse_file_impl,

crates/hir-analysis/src/diagnostics.rs → crates/hir/src/analysis/diagnostics.rs

@@ -3,7 +3,7 @@
 //! implement [`DiagnosticVoucher`] which defines the conversion into
 //! [`CompleteDiagnostic`].
 
-use crate::{
+use crate::analysis::{
     HirAnalysisDb,
     name_resolution::diagnostics::{ImportDiag, PathResDiag},
     ty::{
@@ -16,16 +16,16 @@ use crate::{
         ty_def::{TyData, TyVarSort},
     },
 };
+use crate::{
+    ParserError, SpannedHirDb,
+    hir_def::{FieldIndex, PathKind},
+    span::LazySpan,
+};
 use common::diagnostics::{
     CompleteDiagnostic, DiagnosticPass, GlobalErrorCode, LabelStyle, Severity, Span, SpanKind,
     SubDiagnostic,
 };
 use either::Either;
-use hir::{
-    ParserError, SpannedHirDb,
-    hir_def::{FieldIndex, PathKind},
-    span::LazySpan,
-};
 use itertools::Itertools;
 
 /// All diagnostics accumulated in salsa-db should implement
@@ -54,7 +54,7 @@ impl DiagnosticVoucher for CompleteDiagnostic {
 
 #[salsa::db]
 pub trait SpannedHirAnalysisDb:
-    salsa::Database + hir::HirDb + hir::SpannedHirDb + HirAnalysisDb
+    salsa::Database + crate::HirDb + crate::SpannedHirDb + HirAnalysisDb
 {
 }
 

crates/hir-analysis/src/lib.rs → crates/hir/src/analysis/mod.rs

@@ -1,4 +1,4 @@
-use hir::{HirDb, span::DynLazySpan};
+use crate::{HirDb, span::DynLazySpan};
 pub mod analysis_pass;
 pub mod diagnostics;
 

crates/hir-analysis/src/name_resolution/diagnostics.rs → crates/hir/src/analysis/name_resolution/diagnostics.rs

@@ -1,13 +1,13 @@
-use either::Either;
-use hir::{
+use crate::{
     hir_def::{IdentId, PathId, TopLevelMod, Trait},
     span::DynLazySpan,
 };
+use either::Either;
 use salsa::Update;
 use thin_vec::ThinVec;
 
 use super::NameRes;
-use crate::{
+use crate::analysis::{
     HirAnalysisDb,
     ty::ty_def::Kind,
     ty::{func_def::FuncDef, trait_def::TraitInstId, ty_def::TyId},

crates/hir-analysis/src/name_resolution/import_resolver.rs → crates/hir/src/analysis/name_resolution/import_resolver.rs

@@ -4,11 +4,11 @@ use std::{
     mem,
 };
 
-use common::{indexmap::IndexMap, ingot::Ingot};
-use hir::{
+use crate::{
     hir_def::{HirIngot, IdentId, Use, prim_ty::PrimTy, scope_graph::ScopeId},
     span::DynLazySpan,
 };
+use common::{indexmap::IndexMap, ingot::Ingot};
 use itertools::Itertools;
 use rustc_hash::{FxHashMap, FxHashSet};
 use salsa::Update;
@@ -22,7 +22,7 @@ use super::{
         NameResolutionResult, NameResolver, QueryDirective,
     },
 };
-use crate::{HirAnalysisDb, name_resolution::visibility_checker::is_use_visible};
+use crate::analysis::{HirAnalysisDb, name_resolution::visibility_checker::is_use_visible};
 
 pub(crate) struct ImportResolver<'db> {
     db: &'db dyn HirAnalysisDb,

crates/hir-analysis/src/name_resolution/method_selection.rs → crates/hir/src/analysis/name_resolution/method_selection.rs

@@ -1,9 +1,9 @@
+use crate::hir_def::{IdentId, Trait, scope_graph::ScopeId};
 use common::indexmap::IndexSet;
-use hir::hir_def::{IdentId, Trait, scope_graph::ScopeId};
 use rustc_hash::FxHashSet;
 use thin_vec::ThinVec;
 
-use crate::{
+use crate::analysis::{
     HirAnalysisDb,
     name_resolution::{available_traits_in_scope, is_scope_visible_from},
     ty::{

crates/hir-analysis/src/name_resolution/mod.rs → crates/hir/src/analysis/name_resolution/mod.rs

@@ -7,8 +7,8 @@ mod path_resolver;
 pub(crate) mod traits_in_scope;
 mod visibility_checker;
 
+use crate::hir_def::TopLevelMod;
 use common::ingot::Ingot;
-use hir::hir_def::TopLevelMod;
 pub use import_resolver::ResolvedImports;
 pub use name_resolver::{
     EarlyNameQueryId, NameDerivation, NameDomain, NameRes, NameResBucket, NameResKind,
@@ -23,7 +23,9 @@ pub use traits_in_scope::available_traits_in_scope;
 pub(crate) use visibility_checker::is_scope_visible_from;
 
 use self::{diagnostics::ImportDiag, import_resolver::DefaultImporter};
-use crate::{HirAnalysisDb, analysis_pass::ModuleAnalysisPass, diagnostics::DiagnosticVoucher};
+use crate::analysis::{
+    HirAnalysisDb, analysis_pass::ModuleAnalysisPass, diagnostics::DiagnosticVoucher,
+};
 
 #[salsa::tracked(return_ref)]
 pub fn resolve_query<'db>(

crates/hir-analysis/src/name_resolution/name_resolver.rs → crates/hir/src/analysis/name_resolution/name_resolver.rs

@@ -1,7 +1,6 @@
 use std::{cmp, fmt, mem};
 
-use bitflags::bitflags;
-use hir::{
+use crate::{
     hir_def::{
         Enum, EnumVariant, GenericParam, GenericParamOwner, HirIngot, IdentId, ItemKind, Mod,
         TopLevelMod, Trait, Use,
@@ -14,6 +13,7 @@ use hir::{
     },
     span::DynLazySpan,
 };
+use bitflags::bitflags;
 use rustc_hash::{FxHashMap, FxHashSet};
 use salsa::Update;
 use thin_vec::ThinVec;
@@ -22,7 +22,7 @@ use super::{
     import_resolver::Importer,
     visibility_checker::{is_scope_visible_from, is_use_visible},
 };
-use crate::HirAnalysisDb;
+use crate::analysis::HirAnalysisDb;
 
 #[salsa::interned]
 #[derive(Debug)]

crates/hir-analysis/src/name_resolution/path_resolver.rs → crates/hir/src/analysis/name_resolution/path_resolver.rs

@@ -1,12 +1,12 @@
-use common::indexmap::IndexMap;
-use either::Either;
-use hir::{
+use crate::{
     hir_def::{
         Const, Enum, EnumVariant, GenericParamOwner, IdentId, ImplTrait, ItemKind, Partial, PathId,
         PathKind, Trait, TypeBound, TypeId, TypeKind, VariantKind, scope_graph::ScopeId,
     },
     span::{DynLazySpan, path::LazyPathSpan},
 };
+use common::indexmap::IndexMap;
+use either::Either;
 use smallvec::{SmallVec, smallvec};
 use thin_vec::ThinVec;
 
@@ -19,7 +19,7 @@ use super::{
     resolve_query,
     visibility_checker::is_ty_visible_from,
 };
-use crate::{
+use crate::analysis::{
     HirAnalysisDb,
     name_resolution::{NameResKind, QueryDirective},
     ty::{

crates/hir-analysis/src/name_resolution/traits_in_scope.rs → crates/hir/src/analysis/name_resolution/traits_in_scope.rs

@@ -1,7 +1,7 @@
+use crate::hir_def::{Body, ExprId, ItemKind, Mod, TopLevelMod, Trait, scope_graph::ScopeId};
 use common::indexmap::IndexSet;
-use hir::hir_def::{Body, ExprId, ItemKind, Mod, TopLevelMod, Trait, scope_graph::ScopeId};
 
-use crate::{HirAnalysisDb, name_resolution::resolve_imports};
+use crate::analysis::{HirAnalysisDb, name_resolution::resolve_imports};
 
 /// Returns the all traits that are available in the given scope.
 pub fn available_traits_in_scope<'db>(