Update docs

Veykril · Veykril · commit 59c2efe4b6de · 2021-05-10T22:10:12.000+02:00
diff --git 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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-[[rust-analyzer.assist.importMergeBehavior]]rust-analyzer.assist.importMergeBehavior (default: `"full"`)::
	`1`	+[[rust-analyzer.assist.importMergeBehavior]]rust-analyzer.assist.importMergeBehavior (default: `"crate"`)::
`2`	`2`	`+`
`3`	`3`	`--`
`4`	`4`	`The strategy to use when inserting new imports or merging imports.`