diff options
| author | Lukas Wirth <[email protected]> | 2021-05-10 20:33:01 +0100 |
|---|---|---|
| committer | Lukas Wirth <[email protected]> | 2021-05-10 21:10:12 +0100 |
| commit | 59c2efe4b6de41424a5bfd2a0cb59a43ffc11042 (patch) | |
| tree | 95c67ebb7519d93a8c6a18b1e6fe3880ef263d2a | |
| parent | 6a8d47e7f05545de335107262ceca2ef1742888f (diff) | |
Update docs
| -rw-r--r-- | crates/rust-analyzer/src/config.rs | 4 | ||||
| -rw-r--r-- | 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 { | |||
| 709 | #[serde(rename_all = "snake_case")] | 709 | #[serde(rename_all = "snake_case")] |
| 710 | enum MergeBehaviorDef { | 710 | enum MergeBehaviorDef { |
| 711 | None, | 711 | None, |
| 712 | #[serde(alias = "Full")] | 712 | #[serde(alias = "full")] |
| 713 | Crate, | 713 | Crate, |
| 714 | #[serde(alias = "Last")] | 714 | #[serde(alias = "last")] |
| 715 | Module, | 715 | Module, |
| 716 | } | 716 | } |
| 717 | 717 | ||
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 @@ | |||
| 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 | The strategy to use when inserting new imports or merging imports. | 4 | The strategy to use when inserting new imports or merging imports. |