diff options
| author | bors <bors@rust-lang.org> | 2023-04-24 20:10:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-24 20:10:07 +0000 |
| commit | 0c0025f4cd14a61eb279efaa76dad4b672233f75 (patch) | |
| tree | 561a7884d76034abb57af695001b6b24ebfd2c5c | |
| parent | 15ef5f552374e52ca3b578757880938e354b6cc0 (diff) | |
| parent | 59c4cc36c46f39b01bd2262be34c078f667d8635 (diff) | |
| download | rust-0c0025f4cd14a61eb279efaa76dad4b672233f75.tar.gz rust-0c0025f4cd14a61eb279efaa76dad4b672233f75.zip | |
Auto merge of #14647 - whentojump:patch-1, r=Veykril
fix: remove extra argument "rustc" Two extra "rustc"s were accidentally introduced [here](https://github.com/rust-lang/rust-analyzer/commit/33591cd3f47b14961ed07a99ac23deece704243c#diff-53e4b6b2c1ff2465d8abd50db160753199426fd788ddcad925752e0838e28de2R156-R169). (I guess because `cmd` is sometimes initialized with a `cargo` under the hood, sometimes `rustc`, thus error-prone?) One of them has been fixed [here](https://github.com/rust-lang/rust-analyzer/commit/384fa4b84ae881f402933e105c5c92b8b471036a#diff-35c78d76dfccbcece2c917b1e5b9a8e0951d5e340cf579e5ce4951142e2077d3R32). This patch fixes the other.
| -rw-r--r-- | crates/project-model/src/target_data_layout.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/project-model/src/target_data_layout.rs b/crates/project-model/src/target_data_layout.rs index 42c06ad0ed3..30ca7b348e8 100644 --- a/crates/project-model/src/target_data_layout.rs +++ b/crates/project-model/src/target_data_layout.rs @@ -16,7 +16,7 @@ pub fn get( let mut cmd = Command::new(toolchain::rustc()); cmd.envs(extra_env); cmd.current_dir(cargo_toml.parent()) - .args(["-Z", "unstable-options", "rustc", "--print", "target-spec-json"]) + .args(["-Z", "unstable-options", "--print", "target-spec-json"]) .env("RUSTC_BOOTSTRAP", "1"); if let Some(target) = target { cmd.args(["--target", target]); |