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

hard-code nightly-only CFGs

Browse source
This commit is contained in:
Aleksey Kladov 2019-10-08 14:43:29 +03:00
parent 972079c0e3
commit 857f419c9d
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_project_model/src/lib.rs
View file

@ -320,6 +320,14 @@ fn find_cargo_toml(path: &Path) -> Result<PathBuf> {
pub fn get_rustc_cfg_options() -> CfgOptions { pub fn get_rustc_cfg_options() -> CfgOptions {
let mut cfg_options = CfgOptions::default(); let mut cfg_options = CfgOptions::default();
// Some nightly-only cfgs, which are required for stdlib
{
cfg_options.insert_atom("target_thread_local".into());
for &target_has_atomic in ["16", "32", "64", "8", "cas", "ptr"].iter() {
cfg_options.insert_key_value("target_has_atomic".into(), target_has_atomic.into())
}
}
match (|| -> Result<_> { match (|| -> Result<_> {
// `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here. // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here.
let output = Command::new("rustc").args(&["--print", "cfg", "-O"]).output()?; let output = Command::new("rustc").args(&["--print", "cfg", "-O"]).output()?;