diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-02 17:16:38 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-02 17:16:38 +0100 |
commit | 0035dafbfa563921e2cfe41f5592fc37bff92294 (patch) | |
tree | 470486eb6a10dc4c8099a8e82f980abe1ab35f19 | |
parent | f137b3a4e626bdef165e0ad7c61c88c44797798e (diff) | |
parent | 7a66d9989713475a10eb20b8c772287b435fecd3 (diff) |
Merge #4711
4711: Disable rust-analyzer.{cargo,checkOnSave}.allFeatures by default r=matklad a=lnicola
Co-authored-by: Laurențiu Nicola <[email protected]>
-rw-r--r-- | crates/ra_project_model/src/cargo_workspace.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 2 | ||||
-rw-r--r-- | editors/code/package.json | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index a306ce95f..4b7444039 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs | |||
@@ -64,7 +64,7 @@ impl Default for CargoConfig { | |||
64 | fn default() -> Self { | 64 | fn default() -> Self { |
65 | CargoConfig { | 65 | CargoConfig { |
66 | no_default_features: false, | 66 | no_default_features: false, |
67 | all_features: true, | 67 | all_features: false, |
68 | features: Vec::new(), | 68 | features: Vec::new(), |
69 | load_out_dirs_from_check: false, | 69 | load_out_dirs_from_check: false, |
70 | target: None, | 70 | target: None, |
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index c0f7c2c0c..9c6e369d2 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -122,7 +122,7 @@ impl Default for Config { | |||
122 | check: Some(FlycheckConfig::CargoCommand { | 122 | check: Some(FlycheckConfig::CargoCommand { |
123 | command: "check".to_string(), | 123 | command: "check".to_string(), |
124 | all_targets: true, | 124 | all_targets: true, |
125 | all_features: true, | 125 | all_features: false, |
126 | extra_args: Vec::new(), | 126 | extra_args: Vec::new(), |
127 | }), | 127 | }), |
128 | 128 | ||
diff --git a/editors/code/package.json b/editors/code/package.json index 75dbafc05..d8f4287fd 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -238,7 +238,7 @@ | |||
238 | }, | 238 | }, |
239 | "rust-analyzer.cargo.allFeatures": { | 239 | "rust-analyzer.cargo.allFeatures": { |
240 | "type": "boolean", | 240 | "type": "boolean", |
241 | "default": true, | 241 | "default": false, |
242 | "description": "Activate all available features" | 242 | "description": "Activate all available features" |
243 | }, | 243 | }, |
244 | "rust-analyzer.cargo.features": { | 244 | "rust-analyzer.cargo.features": { |
@@ -319,7 +319,7 @@ | |||
319 | }, | 319 | }, |
320 | "rust-analyzer.checkOnSave.allFeatures": { | 320 | "rust-analyzer.checkOnSave.allFeatures": { |
321 | "type": "boolean", | 321 | "type": "boolean", |
322 | "default": true, | 322 | "default": false, |
323 | "markdownDescription": "Check with all features (will be passed as `--all-features`)" | 323 | "markdownDescription": "Check with all features (will be passed as `--all-features`)" |
324 | }, | 324 | }, |
325 | "rust-analyzer.inlayHints.enable": { | 325 | "rust-analyzer.inlayHints.enable": { |