language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-31 20:09:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #18789 from Veykril/push-sypxzqsvmzzp

Browse source 
fix: Fix invalid `-O` flag used by cfg discovery
This commit is contained in:
Lukas Wirth 2024-12-29 15:18:32 +00:00 • committed by GitHub
commit 59bc7b49d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/project-model/src/toolchain_info/rustc_cfg.rs
View file

@ -24,7 +24,26 @@ pub fn get(
} }
}; };
let rustc_cfgs = rustc_cfgs.lines().map(crate::parse_cfg).collect::<Result<Vec<_>, _>>(); // These are unstable but the standard libraries gate on them.
let unstable = vec![
r#"target_has_atomic_equal_alignment="8""#,
r#"target_has_atomic_equal_alignment="16""#,
r#"target_has_atomic_equal_alignment="32""#,
r#"target_has_atomic_equal_alignment="64""#,
r#"target_has_atomic_equal_alignment="128""#,
r#"target_has_atomic_equal_alignment="ptr""#,
r#"target_has_atomic_load_store"#,
r#"target_has_atomic_load_store="8""#,
r#"target_has_atomic_load_store="16""#,
r#"target_has_atomic_load_store="32""#,
r#"target_has_atomic_load_store="64""#,
r#"target_has_atomic_load_store="128""#,
r#"target_has_atomic_load_store="ptr""#,
r#"target_thread_local"#,
r#"target_has_atomic"#,
];
let rustc_cfgs =
rustc_cfgs.lines().chain(unstable).map(crate::parse_cfg).collect::<Result<Vec<_>, _>>();
match rustc_cfgs { match rustc_cfgs {
Ok(rustc_cfgs) => { Ok(rustc_cfgs) => {
tracing::debug!(?rustc_cfgs, "rustc cfgs found"); tracing::debug!(?rustc_cfgs, "rustc cfgs found");
@ -42,13 +61,14 @@ fn rustc_print_cfg(
extra_env: &FxHashMap<String, String>, extra_env: &FxHashMap<String, String>,
config: QueryConfig<'_>, config: QueryConfig<'_>,
) -> anyhow::Result<String> { ) -> anyhow::Result<String> {
const RUSTC_ARGS: [&str; 3] = ["--print", "cfg", "-O"]; const RUSTC_ARGS: [&str; 2] = ["--print", "cfg"];
let (sysroot, current_dir) = match config { let (sysroot, current_dir) = match config {
QueryConfig::Cargo(sysroot, cargo_toml) => { QueryConfig::Cargo(sysroot, cargo_toml) => {
let mut cmd = sysroot.tool(Tool::Cargo, cargo_toml.parent()); let mut cmd = sysroot.tool(Tool::Cargo, cargo_toml.parent());
cmd.envs(extra_env); cmd.envs(extra_env);
cmd.env("RUSTC_BOOTSTRAP", "1"); cmd.env("RUSTC_BOOTSTRAP", "1");
cmd.args(["rustc", "-Z", "unstable-options"]).args(RUSTC_ARGS); cmd.args(["rustc", "-Z", "unstable-options"]).args(RUSTC_ARGS);
cmd.args(["--", "-O"]);
if let Some(target) = target { if let Some(target) = target {
cmd.args(["--target", target]); cmd.args(["--target", target]);
} }
@ -70,6 +90,7 @@ fn rustc_print_cfg(
let mut cmd = sysroot.tool(Tool::Rustc, current_dir); let mut cmd = sysroot.tool(Tool::Rustc, current_dir);
cmd.envs(extra_env); cmd.envs(extra_env);
cmd.args(RUSTC_ARGS); cmd.args(RUSTC_ARGS);
cmd.arg("-O");
if let Some(target) = target { if let Some(target) = target {
cmd.args(["--target", target]); cmd.args(["--target", target]);
} }