Merge branch 'master' into feature/themes

2 files changed, 11 insertions, 20 deletions

diff --git a/crates/ra_ide_api/src/references/rename.rs b/crates/ra_ide_api/src/references/rename.rs
index ee6e73e1b..a8783d7a0 100644
--- a/crates/ra_ide_api/src/references/rename.rs
+++ b/crates/ra_ide_api/src/references/rename.rs
@@ -3,6 +3,7 @@
 use hir::ModuleSource;
 use ra_db::{SourceDatabase, SourceDatabaseExt};
 use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SyntaxNode};
+use ra_text_edit::TextEdit;
 use relative_path::{RelativePath, RelativePathBuf};
 
 use crate::{
@@ -43,14 +44,7 @@ fn source_edit_from_file_id_range(
     range: TextRange,
     new_name: &str,
 ) -> SourceFileEdit {
-    SourceFileEdit {
-        file_id,
-        edit: {
-            let mut builder = ra_text_edit::TextEditBuilder::default();
-            builder.replace(range, new_name.into());
-            builder.finish()
-        },
-    }
+    SourceFileEdit { file_id, edit: TextEdit::replace(range, new_name.into()) }
 }
 
 fn rename_mod(
@@ -94,11 +88,7 @@ fn rename_mod(
 
     let edit = SourceFileEdit {
         file_id: position.file_id,
-        edit: {
-            let mut builder = ra_text_edit::TextEditBuilder::default();
-            builder.replace(ast_name.syntax().text_range(), new_name.into());
-            builder.finish()
-        },
+        edit: TextEdit::replace(ast_name.syntax().text_range(), new_name.into()),
     };
     source_file_edits.push(edit);
 
@@ -126,12 +116,14 @@ fn rename_reference(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_debug_snapshot;
+    use ra_text_edit::TextEditBuilder;
+    use test_utils::assert_eq_text;
+
     use crate::{
         mock_analysis::analysis_and_position, mock_analysis::single_file_with_position, FileId,
         ReferenceSearchResult,
     };
-    use insta::assert_debug_snapshot;
-    use test_utils::assert_eq_text;
 
     #[test]
     fn test_find_all_refs_for_local() {
@@ -452,7 +444,7 @@ mod tests {
     fn test_rename(text: &str, new_name: &str, expected: &str) {
         let (analysis, position) = single_file_with_position(text);
         let source_change = analysis.rename(position, new_name).unwrap();
-        let mut text_edit_builder = ra_text_edit::TextEditBuilder::default();
+        let mut text_edit_builder = TextEditBuilder::default();
         let mut file_id: Option<FileId> = None;
         if let Some(change) = source_change {
             for edit in change.info.source_file_edits {
diff --git a/crates/ra_ide_api/src/references/search_scope.rs b/crates/ra_ide_api/src/references/search_scope.rs
index b6eb248b7..f2789e0b2 100644
--- a/crates/ra_ide_api/src/references/search_scope.rs
+++ b/crates/ra_ide_api/src/references/search_scope.rs
@@ -111,8 +111,7 @@ impl NameDefinition {
         if vis.as_str() != "" {
             let source_root_id = db.file_source_root(file_id);
             let source_root = db.source_root(source_root_id);
-            let mut res =
-                source_root.walk().map(|id| (id.into(), None)).collect::<FxHashMap<_, _>>();
+            let mut res = source_root.walk().map(|id| (id, None)).collect::<FxHashMap<_, _>>();
 
             // FIXME: add "pub(in path)"
 
@@ -120,7 +119,7 @@ impl NameDefinition {
                 return SearchScope::new(res);
             }
             if vis.as_str() == "pub" {
-                let krate = self.container.krate(db).unwrap();
+                let krate = self.container.krate();
                 let crate_graph = db.crate_graph();
                 for crate_id in crate_graph.iter() {
                     let mut crate_deps = crate_graph.dependencies(crate_id);
@@ -128,7 +127,7 @@ impl NameDefinition {
                         let root_file = crate_graph.crate_root(crate_id);
                         let source_root_id = db.file_source_root(root_file);
                         let source_root = db.source_root(source_root_id);
-                        res.extend(source_root.walk().map(|id| (id.into(), None)));
+                        res.extend(source_root.walk().map(|id| (id, None)));
                     }
                 }
                 return SearchScope::new(res);