diff options
Diffstat (limited to 'crates/ra_assists/src')
-rw-r--r-- | crates/ra_assists/src/assist_context.rs | 4 | ||||
-rw-r--r-- | crates/ra_assists/src/utils/insert_use.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs index afd3fd4b9..fcaa1aedc 100644 --- a/crates/ra_assists/src/assist_context.rs +++ b/crates/ra_assists/src/assist_context.rs | |||
@@ -15,7 +15,7 @@ use ra_syntax::{ | |||
15 | AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize, | 15 | AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize, |
16 | TokenAtOffset, | 16 | TokenAtOffset, |
17 | }; | 17 | }; |
18 | use ra_text_edit::TextEditBuilder; | 18 | use text_edit::{TextEdit, TextEditBuilder}; |
19 | 19 | ||
20 | use crate::{ | 20 | use crate::{ |
21 | assist_config::{AssistConfig, SnippetCap}, | 21 | assist_config::{AssistConfig, SnippetCap}, |
@@ -214,7 +214,7 @@ pub(crate) struct AssistBuilder { | |||
214 | impl AssistBuilder { | 214 | impl AssistBuilder { |
215 | pub(crate) fn new(file_id: FileId) -> AssistBuilder { | 215 | pub(crate) fn new(file_id: FileId) -> AssistBuilder { |
216 | AssistBuilder { | 216 | AssistBuilder { |
217 | edit: TextEditBuilder::default(), | 217 | edit: TextEdit::builder(), |
218 | file_id, | 218 | file_id, |
219 | is_snippet: false, | 219 | is_snippet: false, |
220 | change: SourceChange::default(), | 220 | change: SourceChange::default(), |
diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/ra_assists/src/utils/insert_use.rs index 32780fceb..13dbe1919 100644 --- a/crates/ra_assists/src/utils/insert_use.rs +++ b/crates/ra_assists/src/utils/insert_use.rs | |||
@@ -2,6 +2,7 @@ | |||
2 | // FIXME: rewrite according to the plan, outlined in | 2 | // FIXME: rewrite according to the plan, outlined in |
3 | // https://github.com/rust-analyzer/rust-analyzer/issues/3301#issuecomment-592931553 | 3 | // https://github.com/rust-analyzer/rust-analyzer/issues/3301#issuecomment-592931553 |
4 | 4 | ||
5 | use either::Either; | ||
5 | use hir::{self, ModPath}; | 6 | use hir::{self, ModPath}; |
6 | use ra_syntax::{ | 7 | use ra_syntax::{ |
7 | ast::{self, NameOwner, VisibilityOwner}, | 8 | ast::{self, NameOwner, VisibilityOwner}, |
@@ -9,10 +10,9 @@ use ra_syntax::{ | |||
9 | SyntaxKind::{PATH, PATH_SEGMENT}, | 10 | SyntaxKind::{PATH, PATH_SEGMENT}, |
10 | SyntaxNode, T, | 11 | SyntaxNode, T, |
11 | }; | 12 | }; |
12 | use ra_text_edit::TextEditBuilder; | 13 | use text_edit::TextEditBuilder; |
13 | 14 | ||
14 | use crate::assist_context::AssistContext; | 15 | use crate::assist_context::AssistContext; |
15 | use either::Either; | ||
16 | 16 | ||
17 | /// Determines the containing syntax node in which to insert a `use` statement affecting `position`. | 17 | /// Determines the containing syntax node in which to insert a `use` statement affecting `position`. |
18 | pub(crate) fn find_insert_use_container( | 18 | pub(crate) fn find_insert_use_container( |