diff options
Diffstat (limited to 'crates/completion/src/item.rs')
-rw-r--r-- | crates/completion/src/item.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/completion/src/item.rs b/crates/completion/src/item.rs index bd94402d7..83166df4e 100644 --- a/crates/completion/src/item.rs +++ b/crates/completion/src/item.rs | |||
@@ -4,7 +4,7 @@ use std::fmt; | |||
4 | 4 | ||
5 | use hir::{Documentation, ModPath, Mutability}; | 5 | use hir::{Documentation, ModPath, Mutability}; |
6 | use ide_db::helpers::{ | 6 | use ide_db::helpers::{ |
7 | insert_use::{self, ImportScope, MergeBehaviour}, | 7 | insert_use::{self, ImportScope, MergeBehavior}, |
8 | mod_path_to_ast, | 8 | mod_path_to_ast, |
9 | }; | 9 | }; |
10 | use syntax::{algo, TextRange}; | 10 | use syntax::{algo, TextRange}; |
@@ -271,7 +271,7 @@ impl CompletionItem { | |||
271 | pub struct ImportEdit { | 271 | pub struct ImportEdit { |
272 | pub import_path: ModPath, | 272 | pub import_path: ModPath, |
273 | pub import_scope: ImportScope, | 273 | pub import_scope: ImportScope, |
274 | pub merge_behaviour: Option<MergeBehaviour>, | 274 | pub merge_behavior: Option<MergeBehavior>, |
275 | } | 275 | } |
276 | 276 | ||
277 | impl ImportEdit { | 277 | impl ImportEdit { |
@@ -283,7 +283,7 @@ impl ImportEdit { | |||
283 | let rewriter = insert_use::insert_use( | 283 | let rewriter = insert_use::insert_use( |
284 | &self.import_scope, | 284 | &self.import_scope, |
285 | mod_path_to_ast(&self.import_path), | 285 | mod_path_to_ast(&self.import_path), |
286 | self.merge_behaviour, | 286 | self.merge_behavior, |
287 | ); | 287 | ); |
288 | let old_ast = rewriter.rewrite_root()?; | 288 | let old_ast = rewriter.rewrite_root()?; |
289 | let mut import_insert = TextEdit::builder(); | 289 | let mut import_insert = TextEdit::builder(); |