bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-expand/src/change.rs')
-rw-r--r--crates/hir-expand/src/change.rs43
1 files changed, 10 insertions, 33 deletions
diff --git a/crates/hir-expand/src/change.rs b/crates/hir-expand/src/change.rs
index 8b3f69db02..de3a7b9f56 100644
--- a/crates/hir-expand/src/change.rs
+++ b/crates/hir-expand/src/change.rs
@@ -1,10 +1,10 @@
//! Defines a unit of change that can applied to the database to get the next
//! state. Changes are transactional.
use base_db::{
- salsa::Durability, CrateGraph, CrateId, FileChange, SourceRoot, SourceRootDatabase,
- TargetLayoutLoadResult, Version,
+ salsa::Durability, CrateGraph, CrateId, CrateWorkspaceData, FileChange, SourceRoot,
+ SourceRootDatabase,
};
-use la_arena::RawIdx;
+use rustc_hash::FxHashMap;
use span::FileId;
use triomphe::Arc;
@@ -14,8 +14,6 @@ use crate::{db::ExpandDatabase, proc_macro::ProcMacros};
pub struct ChangeWithProcMacros {
pub source_change: FileChange,
pub proc_macros: Option<ProcMacros>,
- pub toolchains: Option<Vec<Option<Version>>>,
- pub target_data_layouts: Option<Vec<TargetLayoutLoadResult>>,
}
impl ChangeWithProcMacros {
@@ -28,46 +26,25 @@ impl ChangeWithProcMacros {
if let Some(proc_macros) = self.proc_macros {
db.set_proc_macros_with_durability(Arc::new(proc_macros), Durability::HIGH);
}
- if let Some(target_data_layouts) = self.target_data_layouts {
- for (id, val) in target_data_layouts.into_iter().enumerate() {
- db.set_data_layout_with_durability(
- CrateId::from_raw(RawIdx::from(id as u32)),
- val,
- Durability::HIGH,
- );
- }
- }
- if let Some(toolchains) = self.toolchains {
- for (id, val) in toolchains.into_iter().enumerate() {
- db.set_toolchain_with_durability(
- CrateId::from_raw(RawIdx::from(id as u32)),
- val,
- Durability::HIGH,
- );
- }
- }
}
pub fn change_file(&mut self, file_id: FileId, new_text: Option<String>) {
self.source_change.change_file(file_id, new_text)
}
- pub fn set_crate_graph(&mut self, graph: CrateGraph) {
- self.source_change.set_crate_graph(graph)
+ pub fn set_crate_graph(
+ &mut self,
+ graph: CrateGraph,
+ ws_data: FxHashMap<CrateId, Arc<CrateWorkspaceData>>,
+ ) {
+ self.source_change.set_crate_graph(graph);
+ self.source_change.set_ws_data(ws_data);
}
pub fn set_proc_macros(&mut self, proc_macros: ProcMacros) {
self.proc_macros = Some(proc_macros);
}
- pub fn set_toolchains(&mut self, toolchains: Vec<Option<Version>>) {
- self.toolchains = Some(toolchains);
- }
-
- pub fn set_target_data_layouts(&mut self, target_data_layouts: Vec<TargetLayoutLoadResult>) {
- self.target_data_layouts = Some(target_data_layouts);
- }
-
pub fn set_roots(&mut self, roots: Vec<SourceRoot>) {
self.source_change.set_roots(roots)
}