Merge pull request #945 from Y-Nak/dependent-ty

Author: Y-Nak

Cargo.lock

@@ -20,6 +20,9 @@ hir = { path = "../hir", package = "fe-hir" }
 common = { path = "../common2", package = "fe-common2" }
 macros = { path = "../macros", package = "fe-macros" }
 fe-compiler-test-utils = { path = "../test-utils" }
+num-bigint = "0.4"
+once_cell = "1.18"
+regex = "1.10"
 
 [dev-dependencies]
 codespan-reporting = "0.11"

crates/hir-analysis/Cargo.toml

@@ -16,13 +16,18 @@ pub struct Jar(
     ty::ty_def::AdtDef,
     ty::ty_def::FuncDef,
     ty::ty_def::AdtRefId,
+    /// Const types.
+    ty::const_ty::ConstTyId,
+    ty::const_ty::evaluate_const_ty,
     /// Type lowering.
     ty::ty_lower::lower_hir_ty,
     ty::ty_lower::lower_adt,
     ty::ty_lower::lower_func,
     ty::ty_lower::lower_type_alias,
     ty::ty_lower::collect_generic_params,
     ty::ty_lower::GenericParamOwnerId,
+    ty::ty_lower::GenericParamTypeSet,
+    ty::ty_lower::evaluate_params_precursor,
     /// Trait lowering.
     ty::trait_lower::lower_trait,
     ty::trait_lower::lower_trait_ref,

crates/hir-analysis/src/lib.rs

@@ -8,9 +8,8 @@ use hir::{
     HirDb,
 };
 
-use crate::HirAnalysisDb;
-
 use super::NameRes;
+use crate::HirAnalysisDb;
 
 #[salsa::accumulator]
 pub struct NameResolutionDiagAccumulator(pub(super) NameResDiag);

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

@@ -11,15 +11,14 @@ use hir::{
 use itertools::Itertools;
 use rustc_hash::{FxHashMap, FxHashSet};
 
-use crate::{name_resolution::visibility_checker::is_use_visible, HirAnalysisDb};
-
 use super::{
     diagnostics::NameResDiag,
     name_resolver::{
         NameDerivation, NameDomain, NameQuery, NameRes, NameResBucket, NameResKind,
         NameResolutionError, NameResolutionResult, NameResolver, QueryDirective,
     },
 };
+use crate::{name_resolution::visibility_checker::is_use_visible, HirAnalysisDb};
 
 pub(crate) struct ImportResolver<'db> {
     db: &'db dyn HirAnalysisDb,
@@ -473,8 +472,8 @@ impl<'db> ImportResolver<'db> {
     // the `i_use` resolution.
     //
     // This is because:
-    // 1. the resolution of the first segment changes depending on whether the
-    //    dependent glob is resolved or not at the time of `i_use` resolution,
+    // 1. the resolution of the first segment changes depending on whether the const
+    //    glob is resolved or not at the time of `i_use` resolution,
     // 2. the order in which uses are resolved is nondeterministic.
     //
     // In normal name resolution rules, the name brought in by a glob always shadows

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

@@ -6,12 +6,6 @@ mod path_resolver;
 mod visibility_checker;
 
 use either::Either;
-pub use import_resolver::ResolvedImports;
-pub use name_resolver::{
-    NameDerivation, NameDomain, NameQuery, NameRes, NameResBucket, NameResKind, QueryDirective,
-};
-pub use path_resolver::EarlyResolvedPath;
-
 use hir::{
     analysis_pass::ModuleAnalysisPass,
     diagnostics::DiagnosticVoucher,
@@ -21,16 +15,20 @@ use hir::{
     },
     visitor::prelude::*,
 };
+pub use import_resolver::ResolvedImports;
+pub use name_resolver::{
+    NameDerivation, NameDomain, NameQuery, NameRes, NameResBucket, NameResKind, QueryDirective,
+};
+pub use path_resolver::EarlyResolvedPath;
 use rustc_hash::FxHashSet;
 
-use crate::HirAnalysisDb;
-
 use self::{
     diagnostics::{ImportResolutionDiagAccumulator, NameResDiag, NameResolutionDiagAccumulator},
     import_resolver::DefaultImporter,
     name_resolver::{NameResolutionError, ResolvedQueryCacheStore},
     path_resolver::EarlyPathResolver,
 };
+use crate::HirAnalysisDb;
 
 // TODO: Implement `resolve_path` and `resolve_segments` after implementing the
 // late path resolution.
@@ -296,7 +294,7 @@ impl<'db, 'a> EarlyPathVisitor<'db, 'a> {
             return;
         };
 
-        let domain = NameDomain::from_scope(scope);
+        let domain = NameDomain::from_scope(self.db, scope);
         let binding = self.inner.resolve_query(query);
         match binding.pick(domain) {
             Ok(_) => {}