diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 9773c4a906..d83670bdad 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 e28423e993..f705582007 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.