From 5a17ee75b363350dad829c7a5f93a320a3393774 Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Fri, 8 Dec 2023 00:42:57 +0100
Subject: [PATCH] Avoid target_os and target_arch in some check-cfg tests

as they unnecessarily clutter the diagnostic output and make the
experience of adding a new target to the compiler more painful than
it should be.

target_os and target_arch are still being tested in the
well-known-values.rs test, but in one place.
---
 tests/ui/check-cfg/compact-values.rs         |  2 +-
 tests/ui/check-cfg/compact-values.stderr     |  6 +++---
 tests/ui/check-cfg/values-target-json.rs     |  4 ----
 tests/ui/check-cfg/values-target-json.stderr | 13 -------------
 4 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 tests/ui/check-cfg/values-target-json.stderr

diff --git a/tests/ui/check-cfg/compact-values.rs b/tests/ui/check-cfg/compact-values.rs
index 13c072fe9206d..80cf75d2770d5 100644
--- a/tests/ui/check-cfg/compact-values.rs
+++ b/tests/ui/check-cfg/compact-values.rs
@@ -8,7 +8,7 @@
 #[cfg(target(os = "linux", arch = "arm"))]
 pub fn expected() {}
 
-#[cfg(target(os = "linux", arch = "X"))]
+#[cfg(target(os = "linux", pointer_width = "X"))]
 //~^ WARNING unexpected `cfg` condition value
 pub fn unexpected() {}
 
diff --git a/tests/ui/check-cfg/compact-values.stderr b/tests/ui/check-cfg/compact-values.stderr
index bb2f4915b5ef6..819b789c3e53b 100644
--- a/tests/ui/check-cfg/compact-values.stderr
+++ b/tests/ui/check-cfg/compact-values.stderr
@@ -1,10 +1,10 @@
 warning: unexpected `cfg` condition value: `X`
   --> $DIR/compact-values.rs:11:28
    |
-LL | #[cfg(target(os = "linux", arch = "X"))]
-   |                            ^^^^^^^^^^
+LL | #[cfg(target(os = "linux", pointer_width = "X"))]
+   |                            ^^^^^^^^^^^^^^^^^^^
    |
-   = note: expected values for `target_arch` are: `aarch64`, `arm`, `avr`, `bpf`, `csky`, `hexagon`, `loongarch64`, `m68k`, `mips`, `mips32r6`, `mips64`, `mips64r6`, `msp430`, `nvptx64`, `powerpc`, `powerpc64`, `riscv32`, `riscv64`, `s390x`, `sparc`, `sparc64`, `wasm32`, `wasm64`, `x86`, `x86_64`
+   = note: expected values for `target_pointer_width` are: `16`, `32`, `64`
    = note: `#[warn(unexpected_cfgs)]` on by default
 
 warning: 1 warning emitted
diff --git a/tests/ui/check-cfg/values-target-json.rs b/tests/ui/check-cfg/values-target-json.rs
index e4c1b54ccccfd..47ac79e0dbffd 100644
--- a/tests/ui/check-cfg/values-target-json.rs
+++ b/tests/ui/check-cfg/values-target-json.rs
@@ -10,10 +10,6 @@
 #[lang = "sized"]
 trait Sized {}
 
-#[cfg(target_os = "linuz")]
-//~^ WARNING unexpected `cfg` condition value
-fn target_os_linux_misspell() {}
-
 #[cfg(target_os = "linux")]
 fn target_os_linux() {}
 
diff --git a/tests/ui/check-cfg/values-target-json.stderr b/tests/ui/check-cfg/values-target-json.stderr
deleted file mode 100644
index e71149f337f58..0000000000000
--- a/tests/ui/check-cfg/values-target-json.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-warning: unexpected `cfg` condition value: `linuz`
-  --> $DIR/values-target-json.rs:13:7
-   |
-LL | #[cfg(target_os = "linuz")]
-   |       ^^^^^^^^^^^^-------
-   |                   |
-   |                   help: there is a expected value with a similar name: `"linux"`
-   |
-   = note: expected values for `target_os` are: `aix`, `android`, `cuda`, `dragonfly`, `emscripten`, `ericos`, `espidf`, `freebsd`, `fuchsia`, `haiku`, `hermit`, `horizon`, `hurd`, `illumos`, `ios`, `l4re`, `linux`, `macos`, `netbsd`, `none`, `nto`, `openbsd`, `psp`, `redox`, `solaris`, `solid_asp3`, `teeos`, `tvos`, `uefi`, `unknown`, `vita`, `vxworks`, `wasi`, `watchos`, `windows`, `xous`
-   = note: `#[warn(unexpected_cfgs)]` on by default
-
-warning: 1 warning emitted
-