Skip to content

Commit 5e3a914

Browse files
Make hir-ty non-diagnostic queries transparent
That is, all queries that have a `with_diagnostic` variant. Them being tracked was (maybe) needed before #19462, because back then diagnostics could refer `AstId`s (for macro types), but now they are no longer needed.
1 parent ea27351 commit 5e3a914

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

crates/hir-ty/src/db.rs

+6
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,21 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
127127
fn impl_self_ty_with_diagnostics(&self, def: ImplId) -> (Binders<Ty>, Diagnostics);
128128

129129
#[salsa::invoke_actual(crate::lower::impl_self_ty_query)]
130+
#[salsa::transparent]
130131
fn impl_self_ty(&self, def: ImplId) -> Binders<Ty>;
131132

132133
#[salsa::invoke(crate::lower::const_param_ty_with_diagnostics_query)]
133134
fn const_param_ty_with_diagnostics(&self, def: ConstParamId) -> (Ty, Diagnostics);
134135

135136
#[salsa::invoke(crate::lower::const_param_ty_query)]
137+
#[salsa::transparent]
136138
fn const_param_ty(&self, def: ConstParamId) -> Ty;
137139

138140
#[salsa::invoke_actual(crate::lower::impl_trait_with_diagnostics_query)]
139141
fn impl_trait_with_diagnostics(&self, def: ImplId) -> Option<(Binders<TraitRef>, Diagnostics)>;
140142

141143
#[salsa::invoke_actual(crate::lower::impl_trait_query)]
144+
#[salsa::transparent]
142145
fn impl_trait(&self, def: ImplId) -> Option<Binders<TraitRef>>;
143146

144147
#[salsa::invoke_actual(crate::lower::field_types_with_diagnostics_query)]
@@ -148,6 +151,7 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
148151
) -> (Arc<ArenaMap<LocalFieldId, Binders<Ty>>>, Diagnostics);
149152

150153
#[salsa::invoke_actual(crate::lower::field_types_query)]
154+
#[salsa::transparent]
151155
fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalFieldId, Binders<Ty>>>;
152156

153157
#[salsa::invoke_actual(crate::lower::callable_item_signature_query)]
@@ -178,6 +182,7 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
178182
) -> (GenericPredicates, Diagnostics);
179183

180184
#[salsa::invoke_actual(crate::lower::generic_predicates_without_parent_query)]
185+
#[salsa::transparent]
181186
fn generic_predicates_without_parent(&self, def: GenericDefId) -> GenericPredicates;
182187

183188
#[salsa::invoke_actual(crate::lower::trait_environment_for_body_query)]
@@ -195,6 +200,7 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
195200
) -> (GenericDefaults, Diagnostics);
196201

197202
#[salsa::invoke_actual(crate::lower::generic_defaults_query)]
203+
#[salsa::transparent]
198204
fn generic_defaults(&self, def: GenericDefId) -> GenericDefaults;
199205

200206
#[salsa::invoke_actual(InherentImpls::inherent_impls_in_crate_query)]

0 commit comments

Comments
 (0)