From 17f236c2b041de7abd8ec3be208b8eff75fd7ffb Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 10 Dec 2020 17:41:57 +0300 Subject: Normalize spelling to American English --- crates/assists/src/assist_config.rs | 6 +++--- crates/assists/src/handlers/merge_imports.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/assists') diff --git a/crates/assists/src/assist_config.rs b/crates/assists/src/assist_config.rs index 786224cfa..c458d9054 100644 --- a/crates/assists/src/assist_config.rs +++ b/crates/assists/src/assist_config.rs @@ -5,7 +5,7 @@ //! assists if we are allowed to. use hir::PrefixKind; -use ide_db::helpers::insert_use::MergeBehaviour; +use ide_db::helpers::insert_use::MergeBehavior; use crate::AssistKind; @@ -39,12 +39,12 @@ impl Default for AssistConfig { #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct InsertUseConfig { - pub merge: Option, + pub merge: Option, pub prefix_kind: PrefixKind, } impl Default for InsertUseConfig { fn default() -> Self { - InsertUseConfig { merge: Some(MergeBehaviour::Full), prefix_kind: PrefixKind::Plain } + InsertUseConfig { merge: Some(MergeBehavior::Full), prefix_kind: PrefixKind::Plain } } } diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs index b7e853994..2f0dc7831 100644 --- a/crates/assists/src/handlers/merge_imports.rs +++ b/crates/assists/src/handlers/merge_imports.rs @@ -1,4 +1,4 @@ -use ide_db::helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehaviour}; +use ide_db::helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehavior}; use syntax::{ algo::{neighbor, SyntaxRewriter}, ast, AstNode, @@ -30,7 +30,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) { let (merged, to_delete) = next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| { - try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2)) + try_merge_imports(&use_item, &use_item2, MergeBehavior::Full).zip(Some(use_item2)) })?; rewriter.replace_ast(&use_item, &merged); @@ -42,7 +42,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() } else { let (merged, to_delete) = next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| { - try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree)) + try_merge_trees(&tree, &use_tree, MergeBehavior::Full).zip(Some(use_tree)) })?; rewriter.replace_ast(&tree, &merged); -- cgit v1.2.3