about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2024-10-24 06:14:17 +0000
committerGitHub <noreply@github.com>2024-10-24 06:14:17 +0000
commit582f1a67d8bfdfc9256cdf173ed9c9ea34c3b00f (patch)
treef80df2e2435855e6d26af1b4d2af6d0677e019f6
parent5b0821f1b7e03cc8d00ab9f0f4008463fc6148c7 (diff)
parentc93514b67c51b123abd29d591f57abfdb81f8c03 (diff)
downloadrust-582f1a67d8bfdfc9256cdf173ed9c9ea34c3b00f.tar.gz
rust-582f1a67d8bfdfc9256cdf173ed9c9ea34c3b00f.zip
Merge pull request #18395 from Wilfred/missing_cfg_for_core
fix: Add missing cfg flags for `core` crate
-rw-r--r--src/tools/rust-analyzer/crates/project-model/src/rustc_cfg.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/rust-analyzer/crates/project-model/src/rustc_cfg.rs b/src/tools/rust-analyzer/crates/project-model/src/rustc_cfg.rs
index aa73ff89100..bc1f0e6fbf2 100644
--- a/src/tools/rust-analyzer/crates/project-model/src/rustc_cfg.rs
+++ b/src/tools/rust-analyzer/crates/project-model/src/rustc_cfg.rs
@@ -24,14 +24,15 @@ pub(crate) fn get(
     config: RustcCfgConfig<'_>,
 ) -> Vec<CfgAtom> {
     let _p = tracing::info_span!("rustc_cfg::get").entered();
-    let mut res: Vec<_> = Vec::with_capacity(6 * 2 + 1);
+    let mut res: Vec<_> = Vec::with_capacity(7 * 2 + 1);
 
     // Some nightly-only cfgs, which are required for stdlib
     res.push(CfgAtom::Flag(Symbol::intern("target_thread_local")));
-    for ty in ["8", "16", "32", "64", "cas", "ptr"] {
-        for key in ["target_has_atomic", "target_has_atomic_load_store"] {
+    for key in ["target_has_atomic", "target_has_atomic_load_store"] {
+        for ty in ["8", "16", "32", "64", "cas", "ptr"] {
             res.push(CfgAtom::KeyValue { key: Symbol::intern(key), value: Symbol::intern(ty) });
         }
+        res.push(CfgAtom::Flag(Symbol::intern(key)));
     }
 
     let rustc_cfgs = get_rust_cfgs(target, extra_env, config);