diff options
| author | Chayim Refael Friedman <chayimfr@gmail.com> | 2025-04-14 00:54:41 +0300 |
|---|---|---|
| committer | Chayim Refael Friedman <chayimfr@gmail.com> | 2025-04-22 15:19:35 +0300 |
| commit | f0fa09621323e427ff9f7de856bd020bfa9e28f2 (patch) | |
| tree | 2413d023b3529ed059612d37fb010fe6bf45de61 /src | |
| parent | 6f01c7f3d0518abe390bc8003f0b6e86530aa5e9 (diff) | |
| download | rust-f0fa09621323e427ff9f7de856bd020bfa9e28f2.tar.gz rust-f0fa09621323e427ff9f7de856bd020bfa9e28f2.zip | |
Adjust for new Salsa not implementing `Debug` by default
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/rust-analyzer/crates/base-db/src/input.rs | 2 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/crates/base-db/src/lib.rs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/rust-analyzer/crates/base-db/src/input.rs b/src/tools/rust-analyzer/crates/base-db/src/input.rs index 3f6766b3325..addbb3f5851 100644 --- a/src/tools/rust-analyzer/crates/base-db/src/input.rs +++ b/src/tools/rust-analyzer/crates/base-db/src/input.rs @@ -392,7 +392,7 @@ impl BuiltDependency { pub type CratesIdMap = FxHashMap<CrateBuilderId, Crate>; -#[salsa::input(no_debug)] +#[salsa::input] #[derive(Debug)] pub struct Crate { #[return_ref] diff --git a/src/tools/rust-analyzer/crates/base-db/src/lib.rs b/src/tools/rust-analyzer/crates/base-db/src/lib.rs index 55010a0349a..7f7a712577e 100644 --- a/src/tools/rust-analyzer/crates/base-db/src/lib.rs +++ b/src/tools/rust-analyzer/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<str>, 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<SourceRoot>, } |
