aboutsummaryrefslogtreecommitdiff
path: root/crates/assists/src/assist_config.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-12-10 14:53:59 +0000
committerGitHub <[email protected]>2020-12-10 14:53:59 +0000
commit83aa6fbd1ef7fd7faf27d8f7fd8679cb85a8097a (patch)
tree164ef144e07ed4f24c751355b735169878468789 /crates/assists/src/assist_config.rs
parent1341a98f0551edf3a445c40507ab1abb3d7c71bb (diff)
parent17f236c2b041de7abd8ec3be208b8eff75fd7ffb (diff)
Merge #6797
6797: Normalize spelling to American English r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/assists/src/assist_config.rs')
-rw-r--r--crates/assists/src/assist_config.rs6
1 files changed, 3 insertions, 3 deletions
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 @@
5//! assists if we are allowed to. 5//! assists if we are allowed to.
6 6
7use hir::PrefixKind; 7use hir::PrefixKind;
8use ide_db::helpers::insert_use::MergeBehaviour; 8use ide_db::helpers::insert_use::MergeBehavior;
9 9
10use crate::AssistKind; 10use crate::AssistKind;
11 11
@@ -39,12 +39,12 @@ impl Default for AssistConfig {
39 39
40#[derive(Clone, Copy, Debug, PartialEq, Eq)] 40#[derive(Clone, Copy, Debug, PartialEq, Eq)]
41pub struct InsertUseConfig { 41pub struct InsertUseConfig {
42 pub merge: Option<MergeBehaviour>, 42 pub merge: Option<MergeBehavior>,
43 pub prefix_kind: PrefixKind, 43 pub prefix_kind: PrefixKind,
44} 44}
45 45
46impl Default for InsertUseConfig { 46impl Default for InsertUseConfig {
47 fn default() -> Self { 47 fn default() -> Self {
48 InsertUseConfig { merge: Some(MergeBehaviour::Full), prefix_kind: PrefixKind::Plain } 48 InsertUseConfig { merge: Some(MergeBehavior::Full), prefix_kind: PrefixKind::Plain }
49 } 49 }
50} 50}