diff options
| author | bors <bors@rust-lang.org> | 2023-05-11 05:06:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-11 05:06:09 +0000 |
| commit | 4d941cd9812891af3b83dd4de64aa7d8ee99641a (patch) | |
| tree | 458d6d5e2e9b8202b580eca7c9d61f9bfd19889c /compiler/rustc_interface/src/interface.rs | |
| parent | 9a767b6b9e1e53c3cfc25103ed7c88d77ee65d5d (diff) | |
| parent | 07af55edd4253e9eef7c170cec246af1a3589e20 (diff) | |
| download | rust-4d941cd9812891af3b83dd4de64aa7d8ee99641a.tar.gz rust-4d941cd9812891af3b83dd4de64aa7d8ee99641a.zip | |
Auto merge of #111452 - matthiaskrgr:rollup-uic8dgy, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #108705 (Prevent ICE with broken borrow in closure) - #111292 (Fix mishandled `--check-cfg` arguments order) - #111382 (Isolate coverage FFI type layouts from their underlying LLVM C++ types) - #111385 (vec-shrink-panik: update expectations to work on LLVM 17) - #111389 (Add esp-idf platform-support page) - #111432 (Use visit_assign to detect SSA locals.) - #111448 (Use proper impl self type for alias impl in rustdoc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src/interface.rs')
| -rw-r--r-- | compiler/rustc_interface/src/interface.rs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/compiler/rustc_interface/src/interface.rs b/compiler/rustc_interface/src/interface.rs index 9d9f4ee13f4..51354c2b127 100644 --- a/compiler/rustc_interface/src/interface.rs +++ b/compiler/rustc_interface/src/interface.rs @@ -173,12 +173,21 @@ pub fn parse_check_cfg(specs: Vec<String>) -> CheckCfg { let expected_values = check_cfg .expecteds .entry(ident.name.to_string()) + .and_modify(|expected_values| match expected_values { + ExpectedValues::Some(_) => {} + ExpectedValues::Any => { + // handle the case where names(...) was done + // before values by changing to a list + *expected_values = + ExpectedValues::Some(FxHashSet::default()); + } + }) .or_insert_with(|| { ExpectedValues::Some(FxHashSet::default()) }); let ExpectedValues::Some(expected_values) = expected_values else { - bug!("shoudn't be possible") + bug!("`expected_values` should be a list a values") }; for val in values { |
