user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20884 from ChayimFriedman2/fix-cfg-error

Browse source 
fix: Fix "cannot insert `true` or `false` to cfg" error in fixtures
This commit is contained in:
Shoyu Vanilla (Flint) 2025-10-23 00:11:51 +00:00 • committed by GitHub
commit e13aab74c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tools/rust-analyzer/crates/cfg/src/lib.rs
View file

@ -115,6 +115,13 @@ impl CfgOptions {
pub fn shrink_to_fit(&mut self) {
self.enabled.shrink_to_fit();
}
pub fn append(&mut self, other: CfgOptions) {
// Do not call `insert_any_atom()`, as it'll check for `true` and `false`, but this is not
// needed since we already checked for that when constructing `other`. Furthermore, this
// will always err, as `other` inevitably contains `true` (just as we do).
self.enabled.extend(other.enabled);
}
}
impl Extend<CfgAtom> for CfgOptions {

2
src/tools/rust-analyzer/crates/test-fixture/src/lib.rs
View file

@ -252,7 +252,7 @@ impl ChangeFixture {
assert!(default_crate_root.is_none());
default_crate_root = Some(file_id);
default_edition = meta.edition;
default_cfg.extend(meta.cfg.into_iter());
default_cfg.append(meta.cfg);
default_env.extend_from_other(&meta.env);
}