1 files changed, 11 insertions, 20 deletions

diff --git a/crates/ra_ide_db/src/source_change.rs b/crates/ra_ide_db/src/source_change.rs
index e713f4b7e..abb83f421 100644
--- a/crates/ra_ide_db/src/source_change.rs
+++ b/crates/ra_ide_db/src/source_change.rs
@@ -3,10 +3,10 @@
 //!
 //! It can be viewed as a dual for `AnalysisChange`.
 
-use ra_db::{FileId, RelativePathBuf, SourceRootId};
+use ra_db::FileId;
 use ra_text_edit::TextEdit;
 
-#[derive(Debug, Clone)]
+#[derive(Default, Debug, Clone)]
 pub struct SourceChange {
     pub source_file_edits: Vec<SourceFileEdit>,
     pub file_system_edits: Vec<FileSystemEdit>,
@@ -22,17 +22,6 @@ impl SourceChange {
     ) -> Self {
         SourceChange { source_file_edits, file_system_edits, is_snippet: false }
     }
-
-    /// Creates a new SourceChange with the given label,
-    /// containing only the given `SourceFileEdits`.
-    pub fn source_file_edits(edits: Vec<SourceFileEdit>) -> Self {
-        SourceChange { source_file_edits: edits, file_system_edits: vec![], is_snippet: false }
-    }
-    /// Creates a new SourceChange with the given label
-    /// from the given `FileId` and `TextEdit`
-    pub fn source_file_edit_from(file_id: FileId, edit: TextEdit) -> Self {
-        SourceFileEdit { file_id, edit }.into()
-    }
 }
 
 #[derive(Debug, Clone)]
@@ -43,18 +32,20 @@ pub struct SourceFileEdit {
 
 impl From<SourceFileEdit> for SourceChange {
     fn from(edit: SourceFileEdit) -> SourceChange {
-        SourceChange {
-            source_file_edits: vec![edit],
-            file_system_edits: Vec::new(),
-            is_snippet: false,
-        }
+        vec![edit].into()
+    }
+}
+
+impl From<Vec<SourceFileEdit>> for SourceChange {
+    fn from(source_file_edits: Vec<SourceFileEdit>) -> SourceChange {
+        SourceChange { source_file_edits, file_system_edits: Vec::new(), is_snippet: false }
     }
 }
 
 #[derive(Debug, Clone)]
 pub enum FileSystemEdit {
-    CreateFile { source_root: SourceRootId, path: RelativePathBuf },
-    MoveFile { src: FileId, dst_source_root: SourceRootId, dst_path: RelativePathBuf },
+    CreateFile { anchor: FileId, dst: String },
+    MoveFile { src: FileId, anchor: FileId, dst: String },
 }
 
 impl From<FileSystemEdit> for SourceChange {