From f4ca42f573e3a8bd9bb5099efa0285855b77367f Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Sat, 6 May 2023 18:26:53 +0200
Subject: [PATCH] Fix --check-cfg bug with args order when parsing
---
compiler/rustc_interface/src/interface.rs | 11 ++++++++++-
.../order-independant.names_after.stderr | 19 +++++++++++++++++++
.../order-independant.names_before.stderr | 19 +++++++++++++++++++
tests/ui/check-cfg/order-independant.rs | 16 ++++++++++++++++
4 files changed, 64 insertions(+), 1 deletion(-)
create mode 100644 tests/ui/check-cfg/order-independant.names_after.stderr
create mode 100644 tests/ui/check-cfg/order-independant.names_before.stderr
create mode 100644 tests/ui/check-cfg/order-independant.rs
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 {
diff --git a/tests/ui/check-cfg/order-independant.names_after.stderr b/tests/ui/check-cfg/order-independant.names_after.stderr
new file mode 100644
index 00000000000..91b81428b38
--- /dev/null
+++ b/tests/ui/check-cfg/order-independant.names_after.stderr
@@ -0,0 +1,19 @@
+warning: unexpected `cfg` condition value
+ --> $DIR/order-independant.rs:8:7
+ |
+LL | #[cfg(a)]
+ | ^- help: specify a config value: `= "b"`
+ |
+ = note: expected values for `a` are: `b`
+ = note: `#[warn(unexpected_cfgs)]` on by default
+
+warning: unexpected `cfg` condition value
+ --> $DIR/order-independant.rs:12:7
+ |
+LL | #[cfg(a = "unk")]
+ | ^^^^^^^^^
+ |
+ = note: expected values for `a` are: `b`
+
+warning: 2 warnings emitted
+
diff --git a/tests/ui/check-cfg/order-independant.names_before.stderr b/tests/ui/check-cfg/order-independant.names_before.stderr
new file mode 100644
index 00000000000..91b81428b38
--- /dev/null
+++ b/tests/ui/check-cfg/order-independant.names_before.stderr
@@ -0,0 +1,19 @@
+warning: unexpected `cfg` condition value
+ --> $DIR/order-independant.rs:8:7
+ |
+LL | #[cfg(a)]
+ | ^- help: specify a config value: `= "b"`
+ |
+ = note: expected values for `a` are: `b`
+ = note: `#[warn(unexpected_cfgs)]` on by default
+
+warning: unexpected `cfg` condition value
+ --> $DIR/order-independant.rs:12:7
+ |
+LL | #[cfg(a = "unk")]
+ | ^^^^^^^^^
+ |
+ = note: expected values for `a` are: `b`
+
+warning: 2 warnings emitted
+
diff --git a/tests/ui/check-cfg/order-independant.rs b/tests/ui/check-cfg/order-independant.rs
new file mode 100644
index 00000000000..ce056b8dcd6
--- /dev/null
+++ b/tests/ui/check-cfg/order-independant.rs
@@ -0,0 +1,16 @@
+// check-pass
+// revisions: names_before names_after
+// compile-flags: -Z unstable-options
+// compile-flags: --check-cfg=names(names_before,names_after)
+// [names_before]compile-flags: --check-cfg=names(a) --check-cfg=values(a,"b")
+// [names_after]compile-flags: --check-cfg=values(a,"b") --check-cfg=names(a)
+
+#[cfg(a)]
+//~^ WARNING unexpected `cfg` condition value
+fn my_cfg() {}
+
+#[cfg(a = "unk")]
+//~^ WARNING unexpected `cfg` condition value
+fn my_cfg() {}
+
+fn main() {}