diff options
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 10 | ||||
-rw-r--r-- | docs/user/generated_config.adoc | 2 | ||||
-rw-r--r-- | editors/code/package.json | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 078c83f75..28e221271 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -180,10 +180,14 @@ config_data! { | |||
180 | /// tests or binaries.\nFor example, it may be `--release`. | 180 | /// tests or binaries.\nFor example, it may be `--release`. |
181 | runnables_cargoExtraArgs: Vec<String> = "[]", | 181 | runnables_cargoExtraArgs: Vec<String> = "[]", |
182 | 182 | ||
183 | /// Path to the rust compiler sources, for usage in rustc_private projects, or "discover" | 183 | /// Path to the Cargo.toml of the rust compiler workspace, for usage in rustc_private |
184 | /// to try to automatically find it. Any project which uses rust-analyzer with the rustcPrivate | 184 | /// projects, or "discover" to try to automatically find it. |
185 | /// | ||
186 | /// Any project which uses rust-analyzer with the rustcPrivate | ||
185 | /// crates must set `[package.metadata.rust-analyzer] rustc_private=true` to use it. | 187 | /// crates must set `[package.metadata.rust-analyzer] rustc_private=true` to use it. |
186 | rustcSource : Option<String> = "null", | 188 | /// |
189 | /// This option is not reloaded automatically; you must restart rust-analyzer for it to take effect. | ||
190 | rustcSource: Option<String> = "null", | ||
187 | 191 | ||
188 | /// Additional arguments to `rustfmt`. | 192 | /// Additional arguments to `rustfmt`. |
189 | rustfmt_extraArgs: Vec<String> = "[]", | 193 | rustfmt_extraArgs: Vec<String> = "[]", |
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc index 5243bcbf6..e0ffcc484 100644 --- a/docs/user/generated_config.adoc +++ b/docs/user/generated_config.adoc | |||
@@ -107,7 +107,7 @@ | |||
107 | [[rust-analyzer.runnables.cargoExtraArgs]]rust-analyzer.runnables.cargoExtraArgs (default: `[]`):: | 107 | [[rust-analyzer.runnables.cargoExtraArgs]]rust-analyzer.runnables.cargoExtraArgs (default: `[]`):: |
108 | Additional arguments to be passed to cargo for runnables such as tests or binaries.\nFor example, it may be `--release`. | 108 | Additional arguments to be passed to cargo for runnables such as tests or binaries.\nFor example, it may be `--release`. |
109 | [[rust-analyzer.rustcSource]]rust-analyzer.rustcSource (default: `null`):: | 109 | [[rust-analyzer.rustcSource]]rust-analyzer.rustcSource (default: `null`):: |
110 | Path to the rust compiler sources, for usage in rustc_private projects, or "discover" to try to automatically find it. Any project which uses rust-analyzer with the rustcPrivate crates must set `[package.metadata.rust-analyzer] rustc_private=true` to use it. | 110 | Path to the Cargo.toml of the rust compiler workspace, for usage in rustc_private projects, or "discover" to try to automatically find it. Any project which uses rust-analyzer with the rustcPrivate crates must set `[package.metadata.rust-analyzer] rustc_private=true` to use it. This option is not reloaded automatically; you must restart rust-analyzer for it to take effect. |
111 | [[rust-analyzer.rustfmt.extraArgs]]rust-analyzer.rustfmt.extraArgs (default: `[]`):: | 111 | [[rust-analyzer.rustfmt.extraArgs]]rust-analyzer.rustfmt.extraArgs (default: `[]`):: |
112 | Additional arguments to `rustfmt`. | 112 | Additional arguments to `rustfmt`. |
113 | [[rust-analyzer.rustfmt.overrideCommand]]rust-analyzer.rustfmt.overrideCommand (default: `null`):: | 113 | [[rust-analyzer.rustfmt.overrideCommand]]rust-analyzer.rustfmt.overrideCommand (default: `null`):: |
diff --git a/editors/code/package.json b/editors/code/package.json index 856f1c94e..e15e7875b 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -713,7 +713,7 @@ | |||
713 | } | 713 | } |
714 | }, | 714 | }, |
715 | "rust-analyzer.rustcSource": { | 715 | "rust-analyzer.rustcSource": { |
716 | "markdownDescription": "Path to the rust compiler sources, for usage in rustc_private projects, or \"discover\" to try to automatically find it. Any project which uses rust-analyzer with the rustcPrivate crates must set `[package.metadata.rust-analyzer] rustc_private=true` to use it.", | 716 | "markdownDescription": "Path to the Cargo.toml of the rust compiler workspace, for usage in rustc_private projects, or \"discover\" to try to automatically find it. Any project which uses rust-analyzer with the rustcPrivate crates must set `[package.metadata.rust-analyzer] rustc_private=true` to use it. This option is not reloaded automatically; you must restart rust-analyzer for it to take effect.", |
717 | "default": null, | 717 | "default": null, |
718 | "type": [ | 718 | "type": [ |
719 | "null", | 719 | "null", |