From 59c2efe4b6de41424a5bfd2a0cb59a43ffc11042 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 10 May 2021 21:33:01 +0200 Subject: Update docs --- crates/rust-analyzer/src/config.rs | 4 ++-- docs/user/generated_config.adoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 9773c4a90..d83670bda 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -709,9 +709,9 @@ enum ManifestOrProjectJson { #[serde(rename_all = "snake_case")] enum MergeBehaviorDef { None, - #[serde(alias = "Full")] + #[serde(alias = "full")] Crate, - #[serde(alias = "Last")] + #[serde(alias = "last")] Module, } diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc index e28423e99..f70558200 100644 --- a/docs/user/generated_config.adoc +++ b/docs/user/generated_config.adoc @@ -1,4 +1,4 @@ -[[rust-analyzer.assist.importMergeBehavior]]rust-analyzer.assist.importMergeBehavior (default: `"full"`):: +[[rust-analyzer.assist.importMergeBehavior]]rust-analyzer.assist.importMergeBehavior (default: `"crate"`):: + -- The strategy to use when inserting new imports or merging imports. -- cgit v1.2.3