diff options
| author | bors <bors@rust-lang.org> | 2024-03-09 06:30:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-09 06:30:07 +0000 |
| commit | 8f08bbe637a017131a73492f39f91e23f0c36303 (patch) | |
| tree | ae09522b7f485ead9a6220486f76d517a056cc58 | |
| parent | 2397e7a887252aa995d3790164b34b6c76ed94b4 (diff) | |
| parent | 79508d909ae664d61a7041f95c20ffae233557d5 (diff) | |
| download | rust-8f08bbe637a017131a73492f39f91e23f0c36303.tar.gz rust-8f08bbe637a017131a73492f39f91e23f0c36303.zip | |
Auto merge of #16795 - mu001999:master, r=Veykril
remove unused struct Snap in lsif Detected by #121752, see https://github.com/rust-lang/rust/pull/121752#issuecomment-1986378328
| -rw-r--r-- | crates/rust-analyzer/src/cli/lsif.rs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/crates/rust-analyzer/src/cli/lsif.rs b/crates/rust-analyzer/src/cli/lsif.rs index 31d2a67981f..f3f5ec1ebde 100644 --- a/crates/rust-analyzer/src/cli/lsif.rs +++ b/crates/rust-analyzer/src/cli/lsif.rs @@ -7,11 +7,7 @@ use ide::{ Analysis, AnalysisHost, FileId, FileRange, MonikerKind, PackageInformation, RootDatabase, StaticIndex, StaticIndexedFile, TokenId, TokenStaticData, }; -use ide_db::{ - base_db::salsa::{self, ParallelDatabase}, - line_index::WideEncoding, - LineIndexDatabase, -}; +use ide_db::{line_index::WideEncoding, LineIndexDatabase}; use load_cargo::{load_workspace, LoadCargoConfig, ProcMacroServerChoice}; use lsp_types::lsif; use project_model::{CargoConfig, ProjectManifest, ProjectWorkspace, RustLibSource}; @@ -25,14 +21,6 @@ use crate::{ version::version, }; -/// Need to wrap Snapshot to provide `Clone` impl for `map_with` -struct Snap<DB>(DB); -impl<DB: ParallelDatabase> Clone for Snap<salsa::Snapshot<DB>> { - fn clone(&self) -> Snap<salsa::Snapshot<DB>> { - Snap(self.0.snapshot()) - } -} - struct LsifManager<'a> { count: i32, token_map: FxHashMap<TokenId, Id>, |