about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChayim Refael Friedman <chayimfr@gmail.com>2025-04-18 07:04:13 +0300
committerChayim Refael Friedman <chayimfr@gmail.com>2025-04-18 07:04:13 +0300
commita16cca47af5b14d4a2fcda183e8a5fe4ec5fe1b4 (patch)
tree953a922ea36ccb7c1547e195854e1415e96dc233
parentc7f35adaafad6e93e395fc2327ff8b06477642e5 (diff)
downloadrust-a16cca47af5b14d4a2fcda183e8a5fe4ec5fe1b4.tar.gz
rust-a16cca47af5b14d4a2fcda183e8a5fe4ec5fe1b4.zip
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.
-rw-r--r--src/tools/rust-analyzer/crates/hir-ty/src/db.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/db.rs b/src/tools/rust-analyzer/crates/hir-ty/src/db.rs
index 0d056900849..b4039672beb 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/db.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/db.rs
@@ -127,18 +127,21 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
     fn impl_self_ty_with_diagnostics(&self, def: ImplId) -> (Binders<Ty>, Diagnostics);
 
     #[salsa::invoke_actual(crate::lower::impl_self_ty_query)]
+    #[salsa::transparent]
     fn impl_self_ty(&self, def: ImplId) -> Binders<Ty>;
 
     #[salsa::invoke(crate::lower::const_param_ty_with_diagnostics_query)]
     fn const_param_ty_with_diagnostics(&self, def: ConstParamId) -> (Ty, Diagnostics);
 
     #[salsa::invoke(crate::lower::const_param_ty_query)]
+    #[salsa::transparent]
     fn const_param_ty(&self, def: ConstParamId) -> Ty;
 
     #[salsa::invoke_actual(crate::lower::impl_trait_with_diagnostics_query)]
     fn impl_trait_with_diagnostics(&self, def: ImplId) -> Option<(Binders<TraitRef>, Diagnostics)>;
 
     #[salsa::invoke_actual(crate::lower::impl_trait_query)]
+    #[salsa::transparent]
     fn impl_trait(&self, def: ImplId) -> Option<Binders<TraitRef>>;
 
     #[salsa::invoke_actual(crate::lower::field_types_with_diagnostics_query)]
@@ -148,6 +151,7 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
     ) -> (Arc<ArenaMap<LocalFieldId, Binders<Ty>>>, Diagnostics);
 
     #[salsa::invoke_actual(crate::lower::field_types_query)]
+    #[salsa::transparent]
     fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalFieldId, Binders<Ty>>>;
 
     #[salsa::invoke_actual(crate::lower::callable_item_signature_query)]
@@ -178,6 +182,7 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
     ) -> (GenericPredicates, Diagnostics);
 
     #[salsa::invoke_actual(crate::lower::generic_predicates_without_parent_query)]
+    #[salsa::transparent]
     fn generic_predicates_without_parent(&self, def: GenericDefId) -> GenericPredicates;
 
     #[salsa::invoke_actual(crate::lower::trait_environment_for_body_query)]
@@ -195,6 +200,7 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
     ) -> (GenericDefaults, Diagnostics);
 
     #[salsa::invoke_actual(crate::lower::generic_defaults_query)]
+    #[salsa::transparent]
     fn generic_defaults(&self, def: GenericDefId) -> GenericDefaults;
 
     #[salsa::invoke_actual(InherentImpls::inherent_impls_in_crate_query)]