1 files changed, 21 insertions, 77 deletions

diff --git a/crates/ra_ide_db/src/source_change.rs b/crates/ra_ide_db/src/source_change.rs
index 94e118dd8..e713f4b7e 100644
--- a/crates/ra_ide_db/src/source_change.rs
+++ b/crates/ra_ide_db/src/source_change.rs
@@ -3,94 +3,35 @@
 //!
 //! It can be viewed as a dual for `AnalysisChange`.
 
-use ra_db::{FileId, FilePosition, RelativePathBuf, SourceRootId};
+use ra_db::{FileId, RelativePathBuf, SourceRootId};
 use ra_text_edit::TextEdit;
 
 #[derive(Debug, Clone)]
 pub struct SourceChange {
-    /// For display in the undo log in the editor
-    pub label: String,
     pub source_file_edits: Vec<SourceFileEdit>,
     pub file_system_edits: Vec<FileSystemEdit>,
-    pub cursor_position: Option<FilePosition>,
     pub is_snippet: bool,
 }
 
 impl SourceChange {
     /// Creates a new SourceChange with the given label
     /// from the edits.
-    pub fn from_edits<L: Into<String>>(
-        label: L,
+    pub fn from_edits(
         source_file_edits: Vec<SourceFileEdit>,
         file_system_edits: Vec<FileSystemEdit>,
     ) -> Self {
-        SourceChange {
-            label: label.into(),
-            source_file_edits,
-            file_system_edits,
-            cursor_position: None,
-            is_snippet: false,
-        }
+        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<L: Into<String>>(label: L, edits: Vec<SourceFileEdit>) -> Self {
-        let label = label.into();
-        assert!(label.starts_with(char::is_uppercase));
-        SourceChange {
-            label: label,
-            source_file_edits: edits,
-            file_system_edits: vec![],
-            cursor_position: None,
-            is_snippet: false,
-        }
-    }
-
-    /// Creates a new SourceChange with the given label,
-    /// containing only the given `FileSystemEdits`.
-    pub(crate) fn file_system_edits<L: Into<String>>(label: L, edits: Vec<FileSystemEdit>) -> Self {
-        SourceChange {
-            label: label.into(),
-            source_file_edits: vec![],
-            file_system_edits: edits,
-            cursor_position: None,
-            is_snippet: false,
-        }
-    }
-
-    /// Creates a new SourceChange with the given label,
-    /// containing only a single `SourceFileEdit`.
-    pub fn source_file_edit<L: Into<String>>(label: L, edit: SourceFileEdit) -> Self {
-        SourceChange::source_file_edits(label, vec![edit])
-    }
-
-    /// Creates a new SourceChange with the given label
-    /// from the given `FileId` and `TextEdit`
-    pub fn source_file_edit_from<L: Into<String>>(
-        label: L,
-        file_id: FileId,
-        edit: TextEdit,
-    ) -> Self {
-        SourceChange::source_file_edit(label, SourceFileEdit { file_id, edit })
+    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 file_system_edit<L: Into<String>>(label: L, edit: FileSystemEdit) -> Self {
-        SourceChange::file_system_edits(label, vec![edit])
-    }
-
-    /// Sets the cursor position to the given `FilePosition`
-    pub fn with_cursor(mut self, cursor_position: FilePosition) -> Self {
-        self.cursor_position = Some(cursor_position);
-        self
-    }
-
-    /// Sets the cursor position to the given `FilePosition`
-    pub fn with_cursor_opt(mut self, cursor_position: Option<FilePosition>) -> Self {
-        self.cursor_position = cursor_position;
-        self
+    pub fn source_file_edit_from(file_id: FileId, edit: TextEdit) -> Self {
+        SourceFileEdit { file_id, edit }.into()
     }
 }
 
@@ -100,24 +41,27 @@ pub struct SourceFileEdit {
     pub edit: TextEdit,
 }
 
+impl From<SourceFileEdit> for SourceChange {
+    fn from(edit: SourceFileEdit) -> SourceChange {
+        SourceChange {
+            source_file_edits: vec![edit],
+            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 },
 }
 
-pub struct SingleFileChange {
-    pub label: String,
-    pub edit: TextEdit,
-}
-
-impl SingleFileChange {
-    pub fn into_source_change(self, file_id: FileId) -> SourceChange {
+impl From<FileSystemEdit> for SourceChange {
+    fn from(edit: FileSystemEdit) -> SourceChange {
         SourceChange {
-            label: self.label,
-            source_file_edits: vec![SourceFileEdit { file_id, edit: self.edit }],
-            file_system_edits: Vec::new(),
-            cursor_position: None,
+            source_file_edits: Vec::new(),
+            file_system_edits: vec![edit],
             is_snippet: false,
         }
     }