language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-02 21:04:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove unnecessary salsa::attach() calls

Browse source
This commit is contained in:
Chayim Refael Friedman 2025-08-21 22:40:58 +03:00
parent a161fd6bc1
commit df375b0855
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ide/src/lib.rs
View file

@ -461,9 +461,7 @@ impl Analysis {
hasher: impl Fn(&InlayHint) -> u64 + Send + UnwindSafe, hasher: impl Fn(&InlayHint) -> u64 + Send + UnwindSafe,
) -> Cancellable<Option<InlayHint>> { ) -> Cancellable<Option<InlayHint>> {
self.with_db(|db| { self.with_db(|db| {
salsa::attach(db, || { inlay_hints::inlay_hints_resolve(db, file_id, resolve_range, hash, config, hasher)
inlay_hints::inlay_hints_resolve(db, file_id, resolve_range, hash, config, hasher)
})
}) })
} }
@ -533,9 +531,7 @@ impl Analysis {
let search_scope = AssertUnwindSafe(search_scope); let search_scope = AssertUnwindSafe(search_scope);
self.with_db(|db| { self.with_db(|db| {
let _ = &search_scope; let _ = &search_scope;
salsa::attach(db, || { references::find_all_refs(&Semantics::new(db), position, search_scope.0)
references::find_all_refs(&Semantics::new(db), position, search_scope.0)
})
}) })
} }
@ -545,7 +541,7 @@ impl Analysis {
config: &HoverConfig, config: &HoverConfig,
range: FileRange, range: FileRange,
) -> Cancellable<Option<RangeInfo<HoverResult>>> { ) -> Cancellable<Option<RangeInfo<HoverResult>>> {
self.with_db(|db| salsa::attach(db, || hover::hover(db, range, config))) self.with_db(|db| hover::hover(db, range, config))
} }
/// Returns moniker of symbol at position. /// Returns moniker of symbol at position.
@ -553,7 +549,7 @@ impl Analysis {
&self, &self,
position: FilePosition, position: FilePosition,
) -> Cancellable<Option<RangeInfo<Vec<moniker::MonikerResult>>>> { ) -> Cancellable<Option<RangeInfo<Vec<moniker::MonikerResult>>>> {
self.with_db(|db| salsa::attach(db, || moniker::moniker(db, position))) self.with_db(|db| moniker::moniker(db, position))
} }
/// Returns URL(s) for the documentation of the symbol under the cursor. /// Returns URL(s) for the documentation of the symbol under the cursor.
@ -581,7 +577,7 @@ impl Analysis {
&self, &self,
position: FilePosition, position: FilePosition,
) -> Cancellable<Option<RangeInfo<Vec<NavigationTarget>>>> { ) -> Cancellable<Option<RangeInfo<Vec<NavigationTarget>>>> {
self.with_db(|db| salsa::attach(db, || call_hierarchy::call_hierarchy(db, position))) self.with_db(|db| call_hierarchy::call_hierarchy(db, position))
} }
/// Computes incoming calls for the given file position. /// Computes incoming calls for the given file position.
@ -649,7 +645,7 @@ impl Analysis {
/// Returns the set of possible targets to run for the current file. /// Returns the set of possible targets to run for the current file.
pub fn runnables(&self, file_id: FileId) -> Cancellable<Vec<Runnable>> { pub fn runnables(&self, file_id: FileId) -> Cancellable<Vec<Runnable>> {
self.with_db(|db| salsa::attach(db, || runnables::runnables(db, file_id))) self.with_db(|db| runnables::runnables(db, file_id))
} }
/// Returns the set of tests for the given file position. /// Returns the set of tests for the given file position.
@ -672,9 +668,7 @@ impl Analysis {
position: FilePosition, position: FilePosition,
) -> Cancellable<Option<Vec<HighlightedRange>>> { ) -> Cancellable<Option<Vec<HighlightedRange>>> {
self.with_db(|db| { self.with_db(|db| {
salsa::attach(db, || { highlight_related::highlight_related(&Semantics::new(db), config, position)
highlight_related::highlight_related(&Semantics::new(db), config, position)
})
}) })
} }