From 2bba385dda5bbdfb1eff2e48f79b446c112d791e Mon Sep 17 00:00:00 2001 From: Chayim Refael Friedman Date: Mon, 14 Apr 2025 00:54:41 +0300 Subject: [PATCH] Adjust for new Salsa not implementing `Debug` by default --- crates/base-db/src/input.rs | 2 +- crates/base-db/src/lib.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/base-db/src/input.rs b/crates/base-db/src/input.rs index 3f6766b332..addbb3f585 100644 --- a/crates/base-db/src/input.rs +++ b/crates/base-db/src/input.rs @@ -392,7 +392,7 @@ impl BuiltDependency { pub type CratesIdMap = FxHashMap; -#[salsa::input(no_debug)] +#[salsa::input] #[derive(Debug)] pub struct Crate { #[return_ref] diff --git a/crates/base-db/src/lib.rs b/crates/base-db/src/lib.rs index 55010a0349..7f7a712577 100644 --- a/crates/base-db/src/lib.rs +++ b/crates/base-db/src/lib.rs @@ -28,7 +28,7 @@ pub use vfs::{AnchoredPath, AnchoredPathBuf, FileId, VfsPath, file_set::FileSet} #[macro_export] macro_rules! impl_intern_key { ($id:ident, $loc:ident) => { - #[salsa::interned(no_debug, no_lifetime)] + #[salsa::interned(no_lifetime)] pub struct $id { pub loc: $loc, } @@ -152,7 +152,7 @@ impl Files { } } -#[salsa::interned(no_lifetime, constructor=from_span)] +#[salsa::interned(no_lifetime, debug, constructor=from_span)] pub struct EditionedFileId { pub editioned_file_id: span::EditionedFileId, } @@ -187,18 +187,18 @@ impl EditionedFileId { } } -#[salsa::input] +#[salsa::input(debug)] pub struct FileText { pub text: Arc, pub file_id: vfs::FileId, } -#[salsa::input] +#[salsa::input(debug)] pub struct FileSourceRootInput { pub source_root_id: SourceRootId, } -#[salsa::input] +#[salsa::input(debug)] pub struct SourceRootInput { pub source_root: Arc, }