aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-14 18:35:44 +0000
committerGitHub <[email protected]>2020-02-14 18:35:44 +0000
commit1ead9ef13bb5da86e470c3d9a69d83795661d3c6 (patch)
treef7f2931805326af3881352b43a3d39baac4306e9 /crates
parent3cf67268a431b19505dd2fd1d796e94fb076f2fb (diff)
parent0bfebb8b2042e787c16bbfa26b1cbcd9425de2ab (diff)
Merge #3143
3143: Make AtomicX type resolve again r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_project_model/src/lib.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index fef405b7f..250255813 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -418,8 +418,10 @@ pub fn get_rustc_cfg_options() -> CfgOptions {
418 // Some nightly-only cfgs, which are required for stdlib 418 // Some nightly-only cfgs, which are required for stdlib
419 { 419 {
420 cfg_options.insert_atom("target_thread_local".into()); 420 cfg_options.insert_atom("target_thread_local".into());
421 for &target_has_atomic in ["16", "32", "64", "8", "cas", "ptr"].iter() { 421 for &target_has_atomic in ["8", "16", "32", "64", "cas", "ptr"].iter() {
422 cfg_options.insert_key_value("target_has_atomic".into(), target_has_atomic.into()) 422 cfg_options.insert_key_value("target_has_atomic".into(), target_has_atomic.into());
423 cfg_options
424 .insert_key_value("target_has_atomic_load_store".into(), target_has_atomic.into());
423 } 425 }
424 } 426 }
425 427