From ed5af989f431b9bfabf6f67350587add05a1942c Mon Sep 17 00:00:00 2001
From: Christophe MASSOLIN <christophe.massolin@gmail.com>
Date: Tue, 28 Apr 2020 00:15:54 +0200
Subject: [config] rename cargo.defaultTarget
---
crates/ra_project_model/src/cargo_workspace.rs | 8 ++++----
crates/rust-analyzer/src/config.rs | 2 +-
editors/code/package.json | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 810833b64..1dfee6b47 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -62,8 +62,8 @@ pub struct CargoConfig {
/// Runs cargo check on launch to figure out the correct values of OUT_DIR
pub load_out_dirs_from_check: bool,
- /// rustc config
- pub rustc: RustcConfig,
+ /// rustc target
+ pub default_target: Option<String>,
}
impl Default for CargoConfig {
@@ -73,7 +73,7 @@ impl Default for CargoConfig {
all_features: true,
features: Vec::new(),
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() {
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()]);
}
let meta = meta.exec().with_context(|| {
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 908208ece..25404ef90 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -134,7 +134,7 @@ impl Config {
set(value, "/cargo/allFeatures", &mut self.cargo.all_features);
set(value, "/cargo/features", &mut self.cargo.features);
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") {
Some(true) => {
diff --git a/editors/code/package.json b/editors/code/package.json
index fe330fb43..775bdaf17 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -237,7 +237,7 @@
"default": false,
"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": [
"null",
"string"
--
cgit v1.2.3