diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-08 11:58:39 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-08 11:58:39 +0000 |
commit | 64e95eee3aa99ac500f9ca4fd8643caee6bf80bb (patch) | |
tree | c2e8b9f02b8d141a464e738f49fe97cf858e7dde | |
parent | 6952a3b4460953bfc854be8ade2763dcfe70b650 (diff) | |
parent | c7b5d6be4c694a83b87fef28fd73aea485194f73 (diff) |
Merge #7914
7914: Make code completion "just work" in more cases r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 2 | ||||
-rw-r--r-- | docs/user/generated_config.adoc | 2 | ||||
-rw-r--r-- | editors/code/package.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index cac48e911..807fecc40 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -49,7 +49,7 @@ config_data! { | |||
49 | cargo_features: Vec<String> = "[]", | 49 | cargo_features: Vec<String> = "[]", |
50 | /// Run build scripts (`build.rs`) for more precise code analysis. | 50 | /// Run build scripts (`build.rs`) for more precise code analysis. |
51 | cargo_runBuildScripts | | 51 | cargo_runBuildScripts | |
52 | cargo_loadOutDirsFromCheck: bool = "false", | 52 | cargo_loadOutDirsFromCheck: bool = "true", |
53 | /// Do not activate the `default` feature. | 53 | /// Do not activate the `default` feature. |
54 | cargo_noDefaultFeatures: bool = "false", | 54 | cargo_noDefaultFeatures: bool = "false", |
55 | /// Compilation target (target triple). | 55 | /// Compilation target (target triple). |
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc index e564c1427..96788bc2c 100644 --- a/docs/user/generated_config.adoc +++ b/docs/user/generated_config.adoc | |||
@@ -12,7 +12,7 @@ | |||
12 | Activate all available features (`--all-features`). | 12 | Activate all available features (`--all-features`). |
13 | [[rust-analyzer.cargo.features]]rust-analyzer.cargo.features (default: `[]`):: | 13 | [[rust-analyzer.cargo.features]]rust-analyzer.cargo.features (default: `[]`):: |
14 | List of features to activate. | 14 | List of features to activate. |
15 | [[rust-analyzer.cargo.runBuildScripts]]rust-analyzer.cargo.runBuildScripts (default: `false`):: | 15 | [[rust-analyzer.cargo.runBuildScripts]]rust-analyzer.cargo.runBuildScripts (default: `true`):: |
16 | Run build scripts (`build.rs`) for more precise code analysis. | 16 | Run build scripts (`build.rs`) for more precise code analysis. |
17 | [[rust-analyzer.cargo.noDefaultFeatures]]rust-analyzer.cargo.noDefaultFeatures (default: `false`):: | 17 | [[rust-analyzer.cargo.noDefaultFeatures]]rust-analyzer.cargo.noDefaultFeatures (default: `false`):: |
18 | Do not activate the `default` feature. | 18 | Do not activate the `default` feature. |
diff --git a/editors/code/package.json b/editors/code/package.json index 176f47920..cabb2d136 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -416,7 +416,7 @@ | |||
416 | }, | 416 | }, |
417 | "rust-analyzer.cargo.runBuildScripts": { | 417 | "rust-analyzer.cargo.runBuildScripts": { |
418 | "markdownDescription": "Run build scripts (`build.rs`) for more precise code analysis.", | 418 | "markdownDescription": "Run build scripts (`build.rs`) for more precise code analysis.", |
419 | "default": false, | 419 | "default": true, |
420 | "type": "boolean" | 420 | "type": "boolean" |
421 | }, | 421 | }, |
422 | "rust-analyzer.cargo.noDefaultFeatures": { | 422 | "rust-analyzer.cargo.noDefaultFeatures": { |