Phase out SourceFileEdits in favour of a plain HashMap

3 files changed, 6 insertions, 8 deletions

diff --git a/crates/rust-analyzer/src/cli/ssr.rs b/crates/rust-analyzer/src/cli/ssr.rs
index 100331c37..bbb550ec9 100644
--- a/crates/rust-analyzer/src/cli/ssr.rs
+++ b/crates/rust-analyzer/src/cli/ssr.rs
@@ -12,7 +12,7 @@ pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> {
         match_finder.add_rule(rule)?;
     }
     let edits = match_finder.edits();
-    for (file_id, edit) in edits.edits {
+    for (file_id, edit) in edits {
         if let Some(path) = vfs.file_path(file_id).as_path() {
             let mut contents = db.file_text(file_id).to_string();
             edit.apply(&mut contents);
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 839466e4f..1a4e0dd32 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -266,7 +266,7 @@ pub(crate) fn handle_on_type_formatting(
     };
 
     // This should be a single-file edit
-    let (_, edit) = edit.source_file_edits.edits.into_iter().next().unwrap();
+    let (_, edit) = edit.source_file_edits.into_iter().next().unwrap();
 
     let change = to_proto::text_edit_vec(&line_index, line_endings, edit);
     Ok(Some(change))
@@ -464,12 +464,10 @@ pub(crate) fn handle_will_rename_files(
 
     // Drop file system edits since we're just renaming things on the same level
     let mut source_changes = source_changes.into_iter();
-    let mut source_file_edits =
-        source_changes.next().map_or_else(Default::default, |it| it.source_file_edits);
+    let mut source_change = source_changes.next().unwrap_or_default();
+    source_change.file_system_edits.clear();
     // no collect here because we want to merge text edits on same file ids
-    source_file_edits.extend(source_changes.map(|it| it.source_file_edits.edits).flatten());
-    let source_change = SourceChange::from_edits(source_file_edits, Vec::new());
-
+    source_change.extend(source_changes.map(|it| it.source_file_edits).flatten());
     let workspace_edit = to_proto::workspace_edit(&snap, source_change)?;
     Ok(Some(workspace_edit))
 }
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 34f510e73..dc67d19a7 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -698,7 +698,7 @@ pub(crate) fn snippet_workspace_edit(
         let ops = snippet_text_document_ops(snap, op);
         document_changes.extend_from_slice(&ops);
     }
-    for (file_id, edit) in source_change.source_file_edits.edits {
+    for (file_id, edit) in source_change.source_file_edits {
         let edit = snippet_text_document_edit(&snap, source_change.is_snippet, file_id, edit)?;
         document_changes.push(lsp_ext::SnippetDocumentChangeOperation::Edit(edit));
     }