diff options
author | Aleksey Kladov <[email protected]> | 2020-12-10 14:41:57 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-12-10 14:51:56 +0000 |
commit | 17f236c2b041de7abd8ec3be208b8eff75fd7ffb (patch) | |
tree | 164ef144e07ed4f24c751355b735169878468789 /crates/ide_db/src/helpers/insert_use | |
parent | 1341a98f0551edf3a445c40507ab1abb3d7c71bb (diff) |
Normalize spelling to American English
Diffstat (limited to 'crates/ide_db/src/helpers/insert_use')
-rw-r--r-- | crates/ide_db/src/helpers/insert_use/tests.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/ide_db/src/helpers/insert_use/tests.rs b/crates/ide_db/src/helpers/insert_use/tests.rs index 86bfa5b41..9e194354e 100644 --- a/crates/ide_db/src/helpers/insert_use/tests.rs +++ b/crates/ide_db/src/helpers/insert_use/tests.rs | |||
@@ -533,7 +533,7 @@ fn merge_last_fail() { | |||
533 | check_merge_only_fail( | 533 | check_merge_only_fail( |
534 | r"use foo::bar::{baz::{Qux, Fez}};", | 534 | r"use foo::bar::{baz::{Qux, Fez}};", |
535 | r"use foo::bar::{baaz::{Quux, Feez}};", | 535 | r"use foo::bar::{baaz::{Quux, Feez}};", |
536 | MergeBehaviour::Last, | 536 | MergeBehavior::Last, |
537 | ); | 537 | ); |
538 | } | 538 | } |
539 | 539 | ||
@@ -542,7 +542,7 @@ fn merge_last_fail1() { | |||
542 | check_merge_only_fail( | 542 | check_merge_only_fail( |
543 | r"use foo::bar::{baz::{Qux, Fez}};", | 543 | r"use foo::bar::{baz::{Qux, Fez}};", |
544 | r"use foo::bar::baaz::{Quux, Feez};", | 544 | r"use foo::bar::baaz::{Quux, Feez};", |
545 | MergeBehaviour::Last, | 545 | MergeBehavior::Last, |
546 | ); | 546 | ); |
547 | } | 547 | } |
548 | 548 | ||
@@ -551,7 +551,7 @@ fn merge_last_fail2() { | |||
551 | check_merge_only_fail( | 551 | check_merge_only_fail( |
552 | r"use foo::bar::baz::{Qux, Fez};", | 552 | r"use foo::bar::baz::{Qux, Fez};", |
553 | r"use foo::bar::{baaz::{Quux, Feez}};", | 553 | r"use foo::bar::{baaz::{Quux, Feez}};", |
554 | MergeBehaviour::Last, | 554 | MergeBehavior::Last, |
555 | ); | 555 | ); |
556 | } | 556 | } |
557 | 557 | ||
@@ -560,7 +560,7 @@ fn merge_last_fail3() { | |||
560 | check_merge_only_fail( | 560 | check_merge_only_fail( |
561 | r"use foo::bar::baz::{Qux, Fez};", | 561 | r"use foo::bar::baz::{Qux, Fez};", |
562 | r"use foo::bar::baaz::{Quux, Feez};", | 562 | r"use foo::bar::baaz::{Quux, Feez};", |
563 | MergeBehaviour::Last, | 563 | MergeBehavior::Last, |
564 | ); | 564 | ); |
565 | } | 565 | } |
566 | 566 | ||
@@ -568,7 +568,7 @@ fn check( | |||
568 | path: &str, | 568 | path: &str, |
569 | ra_fixture_before: &str, | 569 | ra_fixture_before: &str, |
570 | ra_fixture_after: &str, | 570 | ra_fixture_after: &str, |
571 | mb: Option<MergeBehaviour>, | 571 | mb: Option<MergeBehavior>, |
572 | module: bool, | 572 | module: bool, |
573 | ) { | 573 | ) { |
574 | let mut syntax = ast::SourceFile::parse(ra_fixture_before).tree().syntax().clone(); | 574 | let mut syntax = ast::SourceFile::parse(ra_fixture_before).tree().syntax().clone(); |
@@ -589,18 +589,18 @@ fn check( | |||
589 | } | 589 | } |
590 | 590 | ||
591 | fn check_full(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) { | 591 | fn check_full(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) { |
592 | check(path, ra_fixture_before, ra_fixture_after, Some(MergeBehaviour::Full), false) | 592 | check(path, ra_fixture_before, ra_fixture_after, Some(MergeBehavior::Full), false) |
593 | } | 593 | } |
594 | 594 | ||
595 | fn check_last(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) { | 595 | fn check_last(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) { |
596 | check(path, ra_fixture_before, ra_fixture_after, Some(MergeBehaviour::Last), false) | 596 | check(path, ra_fixture_before, ra_fixture_after, Some(MergeBehavior::Last), false) |
597 | } | 597 | } |
598 | 598 | ||
599 | fn check_none(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) { | 599 | fn check_none(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) { |
600 | check(path, ra_fixture_before, ra_fixture_after, None, false) | 600 | check(path, ra_fixture_before, ra_fixture_after, None, false) |
601 | } | 601 | } |
602 | 602 | ||
603 | fn check_merge_only_fail(ra_fixture0: &str, ra_fixture1: &str, mb: MergeBehaviour) { | 603 | fn check_merge_only_fail(ra_fixture0: &str, ra_fixture1: &str, mb: MergeBehavior) { |
604 | let use0 = ast::SourceFile::parse(ra_fixture0) | 604 | let use0 = ast::SourceFile::parse(ra_fixture0) |
605 | .tree() | 605 | .tree() |
606 | .syntax() | 606 | .syntax() |