diff options
| author | Chayim Refael Friedman <chayimfr@gmail.com> | 2025-08-30 23:41:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-30 23:41:14 +0000 |
| commit | dada5f418d3ee89593208489ad32a09660097f39 (patch) | |
| tree | 1d2496a345f9156eeec53ce4595ce2d1ecdcf67a | |
| parent | fd996d02035e1206eee7fab890f6d117d09cd0f7 (diff) | |
| parent | 823101e0895d4ce17576a2aa487ba6fe3e38ea69 (diff) | |
| download | rust-dada5f418d3ee89593208489ad32a09660097f39.tar.gz rust-dada5f418d3ee89593208489ad32a09660097f39.zip | |
Merge pull request #20579 from Elliot-Roberts/fix-double-target-option
fix: Avoid `--target` option being given twice to `rustc` when invoked through `cargo rustc` while fetching target data layout
| -rw-r--r-- | src/tools/rust-analyzer/crates/project-model/src/toolchain_info/target_data_layout.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/tools/rust-analyzer/crates/project-model/src/toolchain_info/target_data_layout.rs b/src/tools/rust-analyzer/crates/project-model/src/toolchain_info/target_data_layout.rs index a28f468e692..f1d99cb8b00 100644 --- a/src/tools/rust-analyzer/crates/project-model/src/toolchain_info/target_data_layout.rs +++ b/src/tools/rust-analyzer/crates/project-model/src/toolchain_info/target_data_layout.rs @@ -23,14 +23,11 @@ pub fn get( QueryConfig::Cargo(sysroot, cargo_toml, _) => { let mut cmd = sysroot.tool(Tool::Cargo, cargo_toml.parent(), extra_env); cmd.env("RUSTC_BOOTSTRAP", "1"); - cmd.args(["rustc", "-Z", "unstable-options"]).args(RUSTC_ARGS).args([ - "--", - "-Z", - "unstable-options", - ]); + cmd.args(["rustc", "-Z", "unstable-options"]).args(RUSTC_ARGS); if let Some(target) = target { cmd.args(["--target", target]); } + cmd.args(["--", "-Z", "unstable-options"]); match utf8_stdout(&mut cmd) { Ok(output) => return process(output), Err(e) => { |