nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[config] rename cargo.defaultTarget

Browse Source
This commit is contained in:
Christophe MASSOLIN 2020-04-28 00:15:54 +02:00
parent b7edffe244
commit ed5af989f4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ra_project_model/src/cargo_workspace.rs
View File

@ -62,8 +62,8 @@ pub struct CargoConfig {
/// Runs cargo check on launch to figure out the correct values of OUT_DIR /// Runs cargo check on launch to figure out the correct values of OUT_DIR
pub load_out_dirs_from_check: bool, pub load_out_dirs_from_check: bool,
/// rustc config /// rustc target
pub rustc: RustcConfig, pub default_target: Option<String>,
} }
impl Default for CargoConfig { impl Default for CargoConfig {
@ -73,7 +73,7 @@ impl Default for CargoConfig {
all_features: true, all_features: true,
features: Vec::new(), features: Vec::new(),
load_out_dirs_from_check: false, load_out_dirs_from_check: false,
rustc: RustcConfig { default_target: None }, default_target: None,
} }
} }
} }
@ -169,7 +169,7 @@ impl CargoWorkspace {
if let Some(parent) = cargo_toml.parent() { if let Some(parent) = cargo_toml.parent() {
meta.current_dir(parent); meta.current_dir(parent);
} }
if let Some(target) = cargo_features.rustc.default_target.as_ref() { if let Some(target) = cargo_features.default_target.as_ref() {
meta.other_options(&[String::from("--filter-platform"), target.clone()]); meta.other_options(&[String::from("--filter-platform"), target.clone()]);
} }
let meta = meta.exec().with_context(|| { let meta = meta.exec().with_context(|| {

2
crates/rust-analyzer/src/config.rs
View File

@ -134,7 +134,7 @@ impl Config {
set(value, "/cargo/allFeatures", &mut self.cargo.all_features); set(value, "/cargo/allFeatures", &mut self.cargo.all_features);
set(value, "/cargo/features", &mut self.cargo.features); set(value, "/cargo/features", &mut self.cargo.features);
set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check); set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
set(value, "/cargo/rustc/defaultTarget", &mut self.cargo.rustc.default_target); set(value, "/cargo/defaultTarget", &mut self.cargo.default_target);
match get(value, "/procMacro/enable") { match get(value, "/procMacro/enable") {
Some(true) => { Some(true) => {

2
editors/code/package.json
View File

@ -237,7 +237,7 @@
"default": false, "default": false,
"markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs" "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs"
}, },
"rust-analyzer.cargo.rustc.defaultTarget": { "rust-analyzer.cargo.defaultTarget": {
"type": [ "type": [
"null", "null",
"string" "string"