language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-24 09:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Adjust for new Salsa not implementing Debug by default

Browse source
This commit is contained in:
Chayim Refael Friedman 2025-04-14 00:54:41 +03:00
parent 1d52d5d422
commit 2bba385dda
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/base-db/src/input.rs
View file

@ -392,7 +392,7 @@ impl BuiltDependency {
pub type CratesIdMap = FxHashMap<CrateBuilderId, Crate>; pub type CratesIdMap = FxHashMap<CrateBuilderId, Crate>;
#[salsa::input(no_debug)] #[salsa::input]
#[derive(Debug)] #[derive(Debug)]
pub struct Crate { pub struct Crate {
#[return_ref] #[return_ref]

10
crates/base-db/src/lib.rs
View file

@ -28,7 +28,7 @@ pub use vfs::{AnchoredPath, AnchoredPathBuf, FileId, VfsPath, file_set::FileSet}
#[macro_export] #[macro_export]
macro_rules! impl_intern_key { macro_rules! impl_intern_key {
($id:ident, $loc:ident) => { ($id:ident, $loc:ident) => {
#[salsa::interned(no_debug, no_lifetime)] #[salsa::interned(no_lifetime)]
pub struct $id { pub struct $id {
pub loc: $loc, 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 struct EditionedFileId {
pub editioned_file_id: span::EditionedFileId, pub editioned_file_id: span::EditionedFileId,
} }
@ -187,18 +187,18 @@ impl EditionedFileId {
} }
} }
#[salsa::input] #[salsa::input(debug)]
pub struct FileText { pub struct FileText {
pub text: Arc<str>, pub text: Arc<str>,
pub file_id: vfs::FileId, pub file_id: vfs::FileId,
} }
#[salsa::input] #[salsa::input(debug)]
pub struct FileSourceRootInput { pub struct FileSourceRootInput {
pub source_root_id: SourceRootId, pub source_root_id: SourceRootId,
} }
#[salsa::input] #[salsa::input(debug)]
pub struct SourceRootInput { pub struct SourceRootInput {
pub source_root: Arc<SourceRoot>, pub source_root: Arc<SourceRoot>,
} }