diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-26 07:29:05 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-26 07:29:05 +0000 |
| commit | d5b8a401f38f88ecb0d894c88dcbab3d338a0ef2 (patch) | |
| tree | e66e6114c6b9588ad3483c6c20510c46f06ab97d /crates | |
| parent | 6ed49683e317413f4585dd2fdad407e20b3abb45 (diff) | |
| parent | 3eaec3cd3390baed7ca1e3bbf31a38f157c13af5 (diff) | |
Merge #7792
7792: docs(ide_assists): Change remaining occurrences of importMergeBehaviour to importMergeBehavior r=lnicola a=SanchithHegde
Co-authored-by: Sanchith Hegde <[email protected]>
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/ide_assists/src/handlers/auto_import.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ide_assists/src/handlers/auto_import.rs b/crates/ide_assists/src/handlers/auto_import.rs index e93901cb3..dc38f90e9 100644 --- a/crates/ide_assists/src/handlers/auto_import.rs +++ b/crates/ide_assists/src/handlers/auto_import.rs | |||
| @@ -33,9 +33,9 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel}; | |||
| 33 | // use super::AssistContext; | 33 | // use super::AssistContext; |
| 34 | // ``` | 34 | // ``` |
| 35 | // | 35 | // |
| 36 | // .Merge Behaviour | 36 | // .Merge Behavior |
| 37 | // | 37 | // |
| 38 | // It is possible to configure how use-trees are merged with the `importMergeBehaviour` setting. | 38 | // It is possible to configure how use-trees are merged with the `importMergeBehavior` setting. |
| 39 | // It has the following configurations: | 39 | // It has the following configurations: |
| 40 | // | 40 | // |
| 41 | // - `full`: This setting will cause auto-import to always completely merge use-trees that share the | 41 | // - `full`: This setting will cause auto-import to always completely merge use-trees that share the |
| @@ -46,7 +46,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel}; | |||
| 46 | // - `none`: This setting will cause auto-import to never merge use-trees keeping them as simple | 46 | // - `none`: This setting will cause auto-import to never merge use-trees keeping them as simple |
| 47 | // paths. | 47 | // paths. |
| 48 | // | 48 | // |
| 49 | // In `VS Code` the configuration for this is `rust-analyzer.assist.importMergeBehaviour`. | 49 | // In `VS Code` the configuration for this is `rust-analyzer.assist.importMergeBehavior`. |
| 50 | // | 50 | // |
| 51 | // .Import Prefix | 51 | // .Import Prefix |
| 52 | // | 52 | // |