rust-analyzer

diff --git a/crates/hir-ty/src/db.rs b/crates/hir-ty/src/db.rs
index 84c6c0471b..42f7ec6b59 100644
--- a/crates/hir-ty/src/db.rs
+++ b/crates/hir-ty/src/db.rs

@@ -121,9 +121,12 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {

def: TyDefId,

) -> crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>;

- #[salsa::invoke(crate::lower::type_for_type_alias_with_diagnostics_query)]

- #[salsa::cycle(cycle_result = crate::lower::type_for_type_alias_with_diagnostics_cycle_result)]

- fn type_for_type_alias_with_diagnostics(&self, def: TypeAliasId) -> (Binders<Ty>, Diagnostics);

+ #[salsa::invoke(crate::lower_nextsolver::type_for_type_alias_with_diagnostics_query)]

+ #[salsa::cycle(cycle_result = crate::lower_nextsolver::type_for_type_alias_with_diagnostics_cycle_result)]

+ fn type_for_type_alias_with_diagnostics<'db>(

+ &'db self,

+ def: TypeAliasId,

+ ) -> (crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>, Diagnostics);

/// Returns the type of the value of the given constant, or `None` if the `ValueTyDefId` is

/// a `StructId` or `EnumVariantId` with a record constructor.

@@ -133,35 +136,56 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {

def: ValueTyDefId,

) -> Option<crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>>;

- #[salsa::invoke(crate::lower::impl_self_ty_with_diagnostics_query)]

- #[salsa::cycle(cycle_result = crate::lower::impl_self_ty_with_diagnostics_cycle_result)]

- fn impl_self_ty_with_diagnostics(&self, def: ImplId) -> (Binders<Ty>, Diagnostics);

+ #[salsa::invoke(crate::lower_nextsolver::impl_self_ty_with_diagnostics_query)]

+ #[salsa::cycle(cycle_result = crate::lower_nextsolver::impl_self_ty_with_diagnostics_cycle_result)]

+ fn impl_self_ty_with_diagnostics<'db>(

+ &'db self,

+ def: ImplId,

+ ) -> (crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>, Diagnostics);

#[salsa::invoke(crate::lower::impl_self_ty_query)]

#[salsa::transparent]

fn impl_self_ty(&self, def: ImplId) -> Binders<Ty>;

// FIXME: Make this a non-interned query.

- #[salsa::invoke_interned(crate::lower::const_param_ty_with_diagnostics_query)]

- #[salsa::cycle(cycle_result = crate::lower::const_param_ty_with_diagnostics_cycle_result)]

- fn const_param_ty_with_diagnostics(&self, def: ConstParamId) -> (Ty, Diagnostics);

+ #[salsa::invoke_interned(crate::lower_nextsolver::const_param_ty_with_diagnostics_query)]

+ #[salsa::cycle(cycle_result = crate::lower_nextsolver::const_param_ty_with_diagnostics_cycle_result)]

+ fn const_param_ty_with_diagnostics<'db>(

+ &'db self,

+ def: ConstParamId,

+ ) -> (crate::next_solver::Ty<'db>, Diagnostics);

- #[salsa::invoke(crate::lower::const_param_ty_query)]

- #[salsa::transparent]

+ // FIXME: Make this a non-interned query.

+ #[salsa::invoke_interned(crate::lower::const_param_ty_query)]

+ #[salsa::cycle(cycle_result = crate::lower::const_param_ty_cycle_result)]

fn const_param_ty(&self, def: ConstParamId) -> Ty;

- #[salsa::invoke(crate::lower::impl_trait_with_diagnostics_query)]

- fn impl_trait_with_diagnostics(&self, def: ImplId) -> Option<(Binders<TraitRef>, Diagnostics)>;

+ #[salsa::invoke(crate::lower_nextsolver::impl_trait_with_diagnostics_query)]

+ fn impl_trait_with_diagnostics<'db>(

+ &'db self,

+ def: ImplId,

+ ) -> Option<(

+ crate::next_solver::EarlyBinder<'db, crate::next_solver::TraitRef<'db>>,

+ Diagnostics,

+ )>;

#[salsa::invoke(crate::lower::impl_trait_query)]

#[salsa::transparent]

fn impl_trait(&self, def: ImplId) -> Option<Binders<TraitRef>>;

- #[salsa::invoke(crate::lower::field_types_with_diagnostics_query)]

- fn field_types_with_diagnostics(

- &self,

+ #[salsa::invoke(crate::lower_nextsolver::field_types_with_diagnostics_query)]

+ fn field_types_with_diagnostics<'db>(

+ &'db self,

var: VariantId,

- ) -> (Arc<ArenaMap<LocalFieldId, Binders<Ty>>>, Diagnostics);

+ ) -> (

+ Arc<

+ ArenaMap<

+ LocalFieldId,

+ crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>,

+ >,

+ Diagnostics,

+ );

#[salsa::invoke(crate::lower::field_types_query)]

#[salsa::transparent]

@@ -191,6 +215,21 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {

#[salsa::invoke(crate::lower::generic_predicates_query)]

fn generic_predicates(&self, def: GenericDefId) -> GenericPredicates;

+ #[salsa::invoke(

+ crate::lower_nextsolver::generic_predicates_without_parent_with_diagnostics_query

+ )]

+ fn generic_predicates_without_parent_with_diagnostics<'db>(

+ &'db self,

+ def: GenericDefId,

+ ) -> (crate::lower_nextsolver::GenericPredicates<'db>, Diagnostics);

+ #[salsa::invoke(crate::lower_nextsolver::generic_predicates_without_parent_query)]

+ #[salsa::transparent]

+ fn generic_predicates_without_parent<'db>(

+ &'db self,

+ def: GenericDefId,

+ ) -> crate::lower_nextsolver::GenericPredicates<'db>;

#[salsa::invoke(crate::lower_nextsolver::trait_environment_for_body_query)]

#[salsa::transparent]

fn trait_environment_for_body<'db>(&'db self, def: DefWithBodyId)

@@ -286,20 +325,6 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {

// next trait solver

- #[salsa::invoke(crate::lower_nextsolver::type_for_type_alias_with_diagnostics_query)]

- #[salsa::cycle(cycle_result = crate::lower_nextsolver::type_for_type_alias_with_diagnostics_cycle_result)]

- fn type_for_type_alias_with_diagnostics_ns<'db>(

- &'db self,

- def: TypeAliasId,

- ) -> (crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>, Diagnostics);

- #[salsa::invoke(crate::lower_nextsolver::impl_self_ty_with_diagnostics_query)]

- #[salsa::cycle(cycle_result = crate::lower_nextsolver::impl_self_ty_with_diagnostics_cycle_result)]

- fn impl_self_ty_with_diagnostics_ns<'db>(

- &'db self,

- def: ImplId,

- ) -> (crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>, Diagnostics);

#[salsa::invoke(crate::lower_nextsolver::impl_self_ty_query)]

#[salsa::transparent]

fn impl_self_ty_ns<'db>(

@@ -307,26 +332,10 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {

def: ImplId,

) -> crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>;

- // FIXME: Make this a non-interned query.

- #[salsa::invoke_interned(crate::lower_nextsolver::const_param_ty_with_diagnostics_query)]

- fn const_param_ty_with_diagnostics_ns<'db>(

- &'db self,

- def: ConstParamId,

- ) -> (crate::next_solver::Ty<'db>, Diagnostics);

#[salsa::invoke(crate::lower_nextsolver::const_param_ty_query)]

#[salsa::transparent]

fn const_param_ty_ns<'db>(&'db self, def: ConstParamId) -> crate::next_solver::Ty<'db>;

- #[salsa::invoke(crate::lower_nextsolver::impl_trait_with_diagnostics_query)]

- fn impl_trait_with_diagnostics_ns<'db>(

- &'db self,

- def: ImplId,

- ) -> Option<(

- crate::next_solver::EarlyBinder<'db, crate::next_solver::TraitRef<'db>>,

- Diagnostics,

- )>;

#[salsa::invoke(crate::lower_nextsolver::impl_trait_query)]

#[salsa::transparent]

fn impl_trait_ns<'db>(

@@ -334,20 +343,6 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {

def: ImplId,

) -> Option<crate::next_solver::EarlyBinder<'db, crate::next_solver::TraitRef<'db>>>;

- #[salsa::invoke(crate::lower_nextsolver::field_types_with_diagnostics_query)]

- fn field_types_with_diagnostics_ns<'db>(

- &'db self,

- var: VariantId,

- ) -> (

- Arc<

- ArenaMap<

- LocalFieldId,

- crate::next_solver::EarlyBinder<'db, crate::next_solver::Ty<'db>>,

- >,

- Diagnostics,

- );

#[salsa::invoke(crate::lower_nextsolver::field_types_query)]

#[salsa::transparent]

fn field_types_ns<'db>(

@@ -383,21 +378,6 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {

&'db self,

def: GenericDefId,

) -> crate::lower_nextsolver::GenericPredicates<'db>;

- #[salsa::invoke(

- crate::lower_nextsolver::generic_predicates_without_parent_with_diagnostics_query

- )]

- fn generic_predicates_without_parent_with_diagnostics_ns<'db>(

- &'db self,

- def: GenericDefId,

- ) -> (crate::lower_nextsolver::GenericPredicates<'db>, Diagnostics);

- #[salsa::invoke(crate::lower_nextsolver::generic_predicates_without_parent_query)]

- #[salsa::transparent]

- fn generic_predicates_without_parent_ns<'db>(

- &'db self,

- def: GenericDefId,

- ) -> crate::lower_nextsolver::GenericPredicates<'db>;

}

#[test]

diff --git a/crates/hir-ty/src/dyn_compatibility.rs b/crates/hir-ty/src/dyn_compatibility.rs
index f033c511ac..b2406a0889 100644
--- a/crates/hir-ty/src/dyn_compatibility.rs
+++ b/crates/hir-ty/src/dyn_compatibility.rs

@@ -364,7 +364,7 @@ where

cb(MethodViolationCode::UndispatchableReceiver)?;

}

- let predicates = &*db.generic_predicates_without_parent_ns(func.into());

+ let predicates = &*db.generic_predicates_without_parent(func.into());

for pred in predicates {

let pred = pred.kind().skip_binder();

diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs
index 598fd38b4b..b55f9cd145 100644
--- a/crates/hir-ty/src/lower.rs
+++ b/crates/hir-ty/src/lower.rs

@@ -32,7 +32,7 @@ use hir_def::{

hir::generics::{GenericParamDataRef, TypeOrConstParamData, WherePredicate},

lang_item::LangItem,

resolver::{HasResolver, LifetimeNs, Resolver, TypeNs},

- signatures::{FunctionSignature, TraitFlags, TypeAliasFlags},

+ signatures::{FunctionSignature, TraitFlags},

type_ref::{

ConstRef, LifetimeRefId, LiteralConstRef, PathId, TraitBoundModifier,

TraitRef as HirTraitRef, TypeBound, TypeRef, TypeRefId,

@@ -908,7 +908,7 @@ pub(crate) fn field_types_query(

db: &dyn HirDatabase,

variant_id: VariantId,

) -> Arc<ArenaMap<LocalFieldId, Binders<Ty>>> {

- db.field_types_with_diagnostics(variant_id).0

+ field_types_with_diagnostics_query(db, variant_id).0

}

/// Build the type of all specific fields of a struct or enum variant.

@@ -1303,46 +1303,6 @@ pub(crate) fn generic_defaults_with_diagnostics_cycle_result(

(GenericDefaults(None), None)

}

-pub(crate) fn type_for_type_alias_with_diagnostics_query(

- db: &dyn HirDatabase,

- t: TypeAliasId,

-) -> (Binders<Ty>, Diagnostics) {

- let generics = generics(db, t.into());

- let type_alias_data = db.type_alias_signature(t);

- let mut diags = None;

- let inner = if type_alias_data.flags.contains(TypeAliasFlags::IS_EXTERN) {

- TyKind::Foreign(crate::to_foreign_def_id(t)).intern(Interner)

- } else {

- let resolver = t.resolver(db);

- let alias = db.type_alias_signature(t);

- let mut ctx = TyLoweringContext::new(

- db,

- &resolver,

- &alias.store,

- t.into(),

- LifetimeElisionKind::AnonymousReportError,

- )

- .with_impl_trait_mode(ImplTraitLoweringMode::Opaque)

- .with_type_param_mode(ParamLoweringMode::Variable);

- let res = alias

- .ty

- .map(|type_ref| ctx.lower_ty(type_ref))

- .unwrap_or_else(|| TyKind::Error.intern(Interner));

- diags = create_diagnostics(ctx.diagnostics);

- res

- };

- (make_binders(db, &generics, inner), diags)

-pub(crate) fn type_for_type_alias_with_diagnostics_cycle_result(

- db: &dyn HirDatabase,

- adt: TypeAliasId,

-) -> (Binders<Ty>, Diagnostics) {

- let generics = generics(db, adt.into());

- (make_binders(db, &generics, TyKind::Error.intern(Interner)), None)

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

pub enum TyDefId {

BuiltinType(BuiltinType),

@@ -1376,7 +1336,7 @@ impl ValueTyDefId {

}

pub(crate) fn impl_self_ty_query(db: &dyn HirDatabase, impl_id: ImplId) -> Binders<Ty> {

- db.impl_self_ty_with_diagnostics(impl_id).0

+ impl_self_ty_with_diagnostics_query(db, impl_id).0

}

pub(crate) fn impl_self_ty_with_diagnostics_query(

@@ -1400,16 +1360,8 @@ pub(crate) fn impl_self_ty_with_diagnostics_query(

)

}

-pub(crate) fn impl_self_ty_with_diagnostics_cycle_result(

- db: &dyn HirDatabase,

- impl_id: ImplId,

-) -> (Binders<Ty>, Diagnostics) {

- let generics = generics(db, impl_id.into());

- (make_binders(db, &generics, TyKind::Error.intern(Interner)), None)

pub(crate) fn const_param_ty_query(db: &dyn HirDatabase, def: ConstParamId) -> Ty {

- db.const_param_ty_with_diagnostics(def).0

+ const_param_ty_with_diagnostics_query(db, def).0

}

// returns None if def is a type arg

@@ -1437,16 +1389,16 @@ pub(crate) fn const_param_ty_with_diagnostics_query(

(ty, create_diagnostics(ctx.diagnostics))

}

-pub(crate) fn const_param_ty_with_diagnostics_cycle_result(

+pub(crate) fn const_param_ty_cycle_result(

_: &dyn HirDatabase,

_: crate::db::HirDatabaseData,

_: ConstParamId,

-) -> (Ty, Diagnostics) {

- (TyKind::Error.intern(Interner), None)

+) -> Ty {

+ TyKind::Error.intern(Interner)

}

pub(crate) fn impl_trait_query(db: &dyn HirDatabase, impl_id: ImplId) -> Option<Binders<TraitRef>> {

- db.impl_trait_with_diagnostics(impl_id).map(|it| it.0)

+ impl_trait_with_diagnostics_query(db, impl_id).map(|it| it.0)

}

pub(crate) fn impl_trait_with_diagnostics_query(

diff --git a/crates/hir-ty/src/lower_nextsolver.rs b/crates/hir-ty/src/lower_nextsolver.rs
index 1ca56feb09..a537d3a101 100644
--- a/crates/hir-ty/src/lower_nextsolver.rs
+++ b/crates/hir-ty/src/lower_nextsolver.rs

@@ -904,7 +904,7 @@ pub(crate) fn impl_trait_query<'db>(

db: &'db dyn HirDatabase,

impl_id: ImplId,

) -> Option<EarlyBinder<'db, TraitRef<'db>>> {

- db.impl_trait_with_diagnostics_ns(impl_id).map(|it| it.0)

+ db.impl_trait_with_diagnostics(impl_id).map(|it| it.0)

}

pub(crate) fn impl_trait_with_diagnostics_query<'db>(

@@ -986,7 +986,7 @@ pub(crate) fn ty_query<'db>(db: &'db dyn HirDatabase, def: TyDefId) -> EarlyBind

AdtDef::new(it, interner),

GenericArgs::identity_for_item(interner, it.into()),

)),

- TyDefId::TypeAliasId(it) => db.type_for_type_alias_with_diagnostics_ns(it).0,

+ TyDefId::TypeAliasId(it) => db.type_for_type_alias_with_diagnostics(it).0,

}

@@ -1131,7 +1131,7 @@ pub(crate) fn impl_self_ty_query<'db>(

db: &'db dyn HirDatabase,

impl_id: ImplId,

) -> EarlyBinder<'db, Ty<'db>> {

- db.impl_self_ty_with_diagnostics_ns(impl_id).0

+ db.impl_self_ty_with_diagnostics(impl_id).0

}

pub(crate) fn impl_self_ty_with_diagnostics_query<'db>(

@@ -1162,7 +1162,7 @@ pub(crate) fn impl_self_ty_with_diagnostics_cycle_result(

}

pub(crate) fn const_param_ty_query<'db>(db: &'db dyn HirDatabase, def: ConstParamId) -> Ty<'db> {

- db.const_param_ty_with_diagnostics_ns(def).0

+ db.const_param_ty_with_diagnostics(def).0

}

// returns None if def is a type arg

@@ -1191,11 +1191,21 @@ pub(crate) fn const_param_ty_with_diagnostics_query<'db>(

(ty, create_diagnostics(ctx.diagnostics))

}

+pub(crate) fn const_param_ty_with_diagnostics_cycle_result<'db>(

+ db: &'db dyn HirDatabase,

+ _: crate::db::HirDatabaseData,

+ def: ConstParamId,

+) -> (Ty<'db>, Diagnostics) {

+ let resolver = def.parent().resolver(db);

+ let interner = DbInterner::new_with(db, Some(resolver.krate()), None);

+ (Ty::new_error(interner, ErrorGuaranteed), None)

pub(crate) fn field_types_query<'db>(

db: &'db dyn HirDatabase,

variant_id: VariantId,

) -> Arc<ArenaMap<LocalFieldId, EarlyBinder<'db, Ty<'db>>>> {

- db.field_types_with_diagnostics_ns(variant_id).0

+ db.field_types_with_diagnostics(variant_id).0

}

/// Build the type of all specific fields of a struct or enum variant.

diff --git a/crates/hir-ty/src/next_solver/interner.rs b/crates/hir-ty/src/next_solver/interner.rs
index 1a14ac9a74..3ff9fde976 100644
--- a/crates/hir-ty/src/next_solver/interner.rs
+++ b/crates/hir-ty/src/next_solver/interner.rs

@@ -1320,7 +1320,7 @@ impl<'db> rustc_type_ir::Interner for DbInterner<'db> {

self,

def_id: Self::DefId,

) -> EarlyBinder<Self, impl IntoIterator<Item = Self::Clause>> {

- let predicates = self.db().generic_predicates_without_parent_ns(def_id.try_into().unwrap());

+ let predicates = self.db().generic_predicates_without_parent(def_id.try_into().unwrap());

let predicates: Vec<_> = predicates.iter().cloned().collect();

EarlyBinder::bind(predicates.into_iter())

}

diff --git a/crates/hir-ty/src/tests/incremental.rs b/crates/hir-ty/src/tests/incremental.rs
index 0d922de9ae..cc5ad2045e 100644
--- a/crates/hir-ty/src/tests/incremental.rs
+++ b/crates/hir-ty/src/tests/incremental.rs

@@ -504,10 +504,8 @@ impl SomeStruct {

"crate_local_def_map",

"trait_impls_in_crate_shim",

"attrs_shim",

- "impl_trait_with_diagnostics_shim",

"impl_signature_shim",

"impl_signature_with_source_map_shim",

- "impl_self_ty_with_diagnostics_shim",

"struct_signature_shim",

"struct_signature_with_source_map_shim",

"attrs_shim",

@@ -608,8 +606,6 @@ fn main() {

"trait_impls_in_crate_shim",

"impl_trait_with_diagnostics_shim",

"impl_self_ty_with_diagnostics_shim",

- "impl_trait_with_diagnostics_ns_shim",

- "impl_self_ty_with_diagnostics_ns_shim",

"generic_predicates_ns_shim",

"value_ty_shim",

"generic_predicates_shim",

@@ -698,8 +694,6 @@ fn main() {

"trait_impls_in_crate_shim",

"impl_trait_with_diagnostics_shim",

"impl_self_ty_with_diagnostics_shim",

- "impl_trait_with_diagnostics_ns_shim",

- "impl_self_ty_with_diagnostics_ns_shim",

"generic_predicates_ns_shim",

"generic_predicates_shim",

]

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 709d165e0b..5592ca285f 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs

@@ -682,7 +682,7 @@ impl Module {

push_ty_diagnostics(

db,

acc,

- db.field_types_with_diagnostics_ns(s.id.into()).1,

+ db.field_types_with_diagnostics(s.id.into()).1,

source_map,

);

}

@@ -694,7 +694,7 @@ impl Module {

push_ty_diagnostics(

db,

acc,

- db.field_types_with_diagnostics_ns(u.id.into()).1,

+ db.field_types_with_diagnostics(u.id.into()).1,

source_map,

);

}

@@ -724,7 +724,7 @@ impl Module {

push_ty_diagnostics(

db,

acc,

- db.field_types_with_diagnostics_ns(v.into()).1,

+ db.field_types_with_diagnostics(v.into()).1,

source_map,

);

expr_store_diagnostics(db, acc, source_map);

@@ -740,7 +740,7 @@ impl Module {

push_ty_diagnostics(

db,

acc,

- db.type_for_type_alias_with_diagnostics_ns(type_alias.id).1,

+ db.type_for_type_alias_with_diagnostics(type_alias.id).1,

&source_map,

);

acc.extend(def.diagnostics(db, style_lints));

@@ -915,13 +915,13 @@ impl Module {

push_ty_diagnostics(

db,

acc,

- db.impl_self_ty_with_diagnostics_ns(impl_def.id).1,

+ db.impl_self_ty_with_diagnostics(impl_def.id).1,

&source_map,

);

push_ty_diagnostics(

db,

acc,

- db.impl_trait_with_diagnostics_ns(impl_def.id).and_then(|it| it.1),

+ db.impl_trait_with_diagnostics(impl_def.id).and_then(|it| it.1),

&source_map,

);

@@ -3693,7 +3693,7 @@ impl AssocItem {

push_ty_diagnostics(

db,

acc,

- db.type_for_type_alias_with_diagnostics_ns(type_alias.id).1,

+ db.type_for_type_alias_with_diagnostics(type_alias.id).1,

&db.type_alias_signature_with_source_map(type_alias.id).1,

);

for diag in hir_ty::diagnostics::incorrect_case(db, type_alias.id.into()) {

@@ -3821,7 +3821,7 @@ impl GenericDef {

push_ty_diagnostics(

db,

acc,

- db.generic_predicates_without_parent_with_diagnostics_ns(def).1,

+ db.generic_predicates_without_parent_with_diagnostics(def).1,

&source_map,

);

for (param_id, param) in generics.iter_type_or_consts() {

@@ -3829,7 +3829,7 @@ impl GenericDef {

push_ty_diagnostics(

db,

acc,

- db.const_param_ty_with_diagnostics_ns(ConstParamId::from_unchecked(

+ db.const_param_ty_with_diagnostics(ConstParamId::from_unchecked(

TypeOrConstParamId { parent: def, local_id: param_id },

))

.1,