diff options
author | Aleksey Kladov <[email protected]> | 2020-08-12 15:52:28 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-08-12 15:52:28 +0100 |
commit | 8d34262956059aca7e6fded351a9299b3581a5cf (patch) | |
tree | d61e655acf03a8116f67f5a65bae4db15d0661df /crates/ra_project_model/src/cargo_workspace.rs | |
parent | 550d7fbe3cbf2af4a47fca6c9bbefaf798cd7b7b (diff) |
Rename ra_toolchain -> toolchain
Diffstat (limited to 'crates/ra_project_model/src/cargo_workspace.rs')
-rw-r--r-- | crates/ra_project_model/src/cargo_workspace.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index a526d743d..abf8dca96 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs | |||
@@ -140,7 +140,7 @@ impl CargoWorkspace { | |||
140 | cargo_features: &CargoConfig, | 140 | cargo_features: &CargoConfig, |
141 | ) -> Result<CargoWorkspace> { | 141 | ) -> Result<CargoWorkspace> { |
142 | let mut meta = MetadataCommand::new(); | 142 | let mut meta = MetadataCommand::new(); |
143 | meta.cargo_path(ra_toolchain::cargo()); | 143 | meta.cargo_path(toolchain::cargo()); |
144 | meta.manifest_path(cargo_toml.to_path_buf()); | 144 | meta.manifest_path(cargo_toml.to_path_buf()); |
145 | if cargo_features.all_features { | 145 | if cargo_features.all_features { |
146 | meta.features(CargoOpt::AllFeatures); | 146 | meta.features(CargoOpt::AllFeatures); |
@@ -288,7 +288,7 @@ pub fn load_extern_resources( | |||
288 | cargo_toml: &Path, | 288 | cargo_toml: &Path, |
289 | cargo_features: &CargoConfig, | 289 | cargo_features: &CargoConfig, |
290 | ) -> Result<ExternResources> { | 290 | ) -> Result<ExternResources> { |
291 | let mut cmd = Command::new(ra_toolchain::cargo()); | 291 | let mut cmd = Command::new(toolchain::cargo()); |
292 | cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml); | 292 | cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml); |
293 | if cargo_features.all_features { | 293 | if cargo_features.all_features { |
294 | cmd.arg("--all-features"); | 294 | cmd.arg("--all-features"); |