Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/base-db/src/input.rs | 2 | ||||
| -rw-r--r-- | crates/hir-ty/src/consteval/tests.rs | 2 | ||||
| -rw-r--r-- | crates/hir-ty/src/db.rs | 4 | ||||
| -rw-r--r-- | crates/hir-ty/src/tests/incremental.rs | 1 | ||||
| -rw-r--r-- | crates/hir/src/lib.rs | 4 |
5 files changed, 5 insertions, 8 deletions
diff --git a/crates/base-db/src/input.rs b/crates/base-db/src/input.rs index f9e69a0326..ffb7f78be6 100644 --- a/crates/base-db/src/input.rs +++ b/crates/base-db/src/input.rs @@ -460,13 +460,11 @@ pub struct Crate { pub env: Env, } -#[salsa::tracked] impl Crate { /// Returns an iterator over all transitive dependencies of the given crate, /// including the crate itself. /// /// **Warning**: do not use this query in `hir-*` crates! It kills incrementality across crate metadata modifications. - #[salsa::tracked(returns(deref))] pub fn transitive_deps(self, db: &dyn salsa::Database) -> Box<[Crate]> { // There is a bit of duplication here and in `CrateGraphBuilder` in the same method, but it's not terrible // and removing that is a bit difficult. diff --git a/crates/hir-ty/src/consteval/tests.rs b/crates/hir-ty/src/consteval/tests.rs index 70185bb7b9..6095250713 100644 --- a/crates/hir-ty/src/consteval/tests.rs +++ b/crates/hir-ty/src/consteval/tests.rs @@ -142,7 +142,7 @@ fn eval_goal(db: &TestDB, file_id: EditionedFileId) -> Result<Const<'_>, ConstEv _ => None, }) .expect("No const named GOAL found in the test"); - db.const_eval(const_id.into(), GenericArgs::new_from_iter(interner, []), None) + db.const_eval(const_id, GenericArgs::new_from_iter(interner, []), None) } #[test] diff --git a/crates/hir-ty/src/db.rs b/crates/hir-ty/src/db.rs index 9ccbd462a3..40e58aaa9e 100644 --- a/crates/hir-ty/src/db.rs +++ b/crates/hir-ty/src/db.rs @@ -4,8 +4,8 @@ use base_db::{Crate, target::TargetLoadError}; use hir_def::{ AdtId, CallableDefId, ConstId, ConstParamId, DefWithBodyId, EnumVariantId, FunctionId, - GenericDefId, ImplId, LifetimeParamId, LocalFieldId, StaticId, TraitId, TypeAliasId, - TypeOrConstParamId, VariantId, db::DefDatabase, hir::ExprId, layout::TargetDataLayout, + GenericDefId, ImplId, LifetimeParamId, LocalFieldId, StaticId, TraitId, TypeAliasId, VariantId, + db::DefDatabase, hir::ExprId, layout::TargetDataLayout, }; use la_arena::ArenaMap; use salsa::plumbing::AsId; diff --git a/crates/hir-ty/src/tests/incremental.rs b/crates/hir-ty/src/tests/incremental.rs index a381f929e8..e98e5e4828 100644 --- a/crates/hir-ty/src/tests/incremental.rs +++ b/crates/hir-ty/src/tests/incremental.rs @@ -613,7 +613,6 @@ fn main() { "impl_signature_with_source_map_shim", "callable_item_signature_shim", "TraitImpls::for_crate_and_deps_", - "Crate::transitive_deps_", "TraitImpls::for_crate_", "impl_trait_with_diagnostics_shim", "impl_self_ty_with_diagnostics_shim", diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 06f826d0df..aec90deca9 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -254,7 +254,7 @@ impl Crate { self.id .transitive_deps(db) .into_iter() - .filter_map(|&krate| db.crate_notable_traits(krate)) + .filter_map(|krate| db.crate_notable_traits(krate)) .flatten() } @@ -2806,7 +2806,7 @@ impl Const { pub fn eval(self, db: &dyn HirDatabase) -> Result<EvaluatedConst<'_>, ConstEvalError<'_>> { let interner = DbInterner::new_with(db, None, None); let ty = db.value_ty(self.id.into()).unwrap().instantiate_identity(); - db.const_eval(self.id.into(), GenericArgs::new_from_iter(interner, []), None) + db.const_eval(self.id, GenericArgs::new_from_iter(interner, []), None) .map(|it| EvaluatedConst { const_: it, def: self.id.into(), ty }) } } |