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

Merge pull request #19644 from ChayimFriedman2/const-syms

Browse source 
internal: Make predefined symbols `const` instead of `static`
This commit is contained in:
Lukas Wirth 2025-04-21 12:34:59 +00:00 • committed by GitHub
commit 34e7d60e30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
72 changed files with 432 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/project-model/src/tests.rs
View file

@ -140,7 +140,7 @@ fn check_crate_graph(crate_graph: CrateGraphBuilder, expect: ExpectFile) {
#[test]
fn cargo_hello_world_project_model_with_wildcard_overrides() {
let cfg_overrides = CfgOverrides {
global: CfgDiff::new(Vec::new(), vec![CfgAtom::Flag(sym::test.clone())]),
global: CfgDiff::new(Vec::new(), vec![CfgAtom::Flag(sym::test)]),
selective: Default::default(),
};
let (crate_graph, _proc_macros) =
@ -159,7 +159,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
global: Default::default(),
selective: std::iter::once((
"libc".to_owned(),
CfgDiff::new(Vec::new(), vec![CfgAtom::Flag(sym::test.clone())]),
CfgDiff::new(Vec::new(), vec![CfgAtom::Flag(sym::test)]),
))
.collect(),
};

40
crates/project-model/src/workspace.rs
View file

@ -1036,9 +1036,9 @@ fn project_json_to_crate_graph(
if *is_workspace_member {
if set_test && !is_sysroot {
// Add test cfg for local crates
cfg_options.insert_atom(sym::test.clone());
cfg_options.insert_atom(sym::test);
}
cfg_options.insert_atom(sym::rust_analyzer.clone());
cfg_options.insert_atom(sym::rust_analyzer);
}
override_cfg.apply(
@ -1159,9 +1159,9 @@ fn cargo_to_crate_graph(
if cargo[pkg].is_local {
if set_test && !cargo.is_sysroot() {
// Add test cfg for local crates
cfg_options.insert_atom(sym::test.clone());
cfg_options.insert_atom(sym::test);
}
cfg_options.insert_atom(sym::rust_analyzer.clone());
cfg_options.insert_atom(sym::rust_analyzer);
}
override_cfg.apply(&mut cfg_options, &cargo[pkg].name);
@ -1351,9 +1351,9 @@ fn detached_file_to_crate_graph(
let mut cfg_options = CfgOptions::from_iter(rustc_cfg);
if set_test {
cfg_options.insert_atom(sym::test.clone());
cfg_options.insert_atom(sym::test);
}
cfg_options.insert_atom(sym::rust_analyzer.clone());
cfg_options.insert_atom(sym::rust_analyzer);
override_cfg.apply(&mut cfg_options, "");
let cfg_options = cfg_options;
@ -1519,16 +1519,17 @@ fn add_target_crate_root(
None
} else {
let mut potential_cfg_options = cfg_options.clone();
potential_cfg_options.extend(pkg.features.iter().map(|feat| CfgAtom::KeyValue {
key: sym::feature.clone(),
value: Symbol::intern(feat.0),
}));
potential_cfg_options.extend(
pkg.features
.iter()
.map(|feat| CfgAtom::KeyValue { key: sym::feature, value: Symbol::intern(feat.0) }),
);
Some(potential_cfg_options)
};
let cfg_options = {
let mut opts = cfg_options;
for feature in pkg.active_features.iter() {
opts.insert_key_value(sym::feature.clone(), Symbol::intern(feature));
opts.insert_key_value(sym::feature, Symbol::intern(feature));
}
if let Some(cfgs) = build_data.map(|(it, _)| &it.cfgs) {
opts.extend(cfgs.iter().cloned());
@ -1662,11 +1663,11 @@ fn sysroot_to_crate_graph(
&CfgOverrides {
global: CfgDiff::new(
vec![
CfgAtom::Flag(sym::debug_assertions.clone()),
CfgAtom::Flag(sym::miri.clone()),
CfgAtom::Flag(sym::bootstrap.clone()),
CfgAtom::Flag(sym::debug_assertions),
CfgAtom::Flag(sym::miri),
CfgAtom::Flag(sym::bootstrap),
],
vec![CfgAtom::Flag(sym::test.clone())],
vec![CfgAtom::Flag(sym::test)],
),
..Default::default()
},
@ -1686,10 +1687,7 @@ fn sysroot_to_crate_graph(
&FxHashMap::default(),
&CfgOverrides {
global: CfgDiff::new(
vec![
CfgAtom::Flag(sym::debug_assertions.clone()),
CfgAtom::Flag(sym::miri.clone()),
],
vec![CfgAtom::Flag(sym::debug_assertions), CfgAtom::Flag(sym::miri)],
vec![],
),
..Default::default()
@ -1705,8 +1703,8 @@ fn sysroot_to_crate_graph(
let cfg_options = {
let mut cfg_options = CfgOptions::default();
cfg_options.extend(rustc_cfg);
cfg_options.insert_atom(sym::debug_assertions.clone());
cfg_options.insert_atom(sym::miri.clone());
cfg_options.insert_atom(sym::debug_assertions);
cfg_options.insert_atom(sym::miri);
cfg_options
};
let sysroot_crates: FxHashMap<