diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-29 15:46:08 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-29 15:46:08 +0000 |
| commit | 65a789368a55416099a8b9d866abb5142273984e (patch) | |
| tree | 33dea0a9fc13dfeaed1c7b1e272adb54e0bcb9cd /crates | |
| parent | 05f75d601f10b32a39b4f03a49f9bde268f0bfc0 (diff) | |
| parent | 21d256de7223bbd0050ded50611cc777bd437331 (diff) | |
Merge #6669
6669: Align default importMergeBehaviour with VSCode r=lnicola a=flodiebold
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/rust-analyzer/src/config.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 30299a465..59269a74b 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
| @@ -480,7 +480,7 @@ macro_rules! config_data { | |||
| 480 | 480 | ||
| 481 | config_data! { | 481 | config_data! { |
| 482 | struct ConfigData { | 482 | struct ConfigData { |
| 483 | assist_importMergeBehaviour: MergeBehaviourDef = MergeBehaviourDef::None, | 483 | assist_importMergeBehaviour: MergeBehaviourDef = MergeBehaviourDef::Full, |
| 484 | assist_importPrefix: ImportPrefixDef = ImportPrefixDef::Plain, | 484 | assist_importPrefix: ImportPrefixDef = ImportPrefixDef::Plain, |
| 485 | 485 | ||
| 486 | callInfo_full: bool = true, | 486 | callInfo_full: bool = true, |