Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

33 files changed, 1 insertions, 1 deletions

diff --git a/src/test/ui/check-cfg/allow-at-crate-level.rs b/tests/ui/check-cfg/allow-at-crate-level.rs
index ce3383a29..ce3383a29 100644
--- a/src/test/ui/check-cfg/allow-at-crate-level.rs
+++ b/tests/ui/check-cfg/allow-at-crate-level.rs
diff --git a/src/test/ui/check-cfg/allow-macro-cfg.rs b/tests/ui/check-cfg/allow-macro-cfg.rs
index 8016a4d19..8016a4d19 100644
--- a/src/test/ui/check-cfg/allow-macro-cfg.rs
+++ b/tests/ui/check-cfg/allow-macro-cfg.rs
diff --git a/src/test/ui/check-cfg/allow-same-level.rs b/tests/ui/check-cfg/allow-same-level.rs
index 6c869dc42..6c869dc42 100644
--- a/src/test/ui/check-cfg/allow-same-level.rs
+++ b/tests/ui/check-cfg/allow-same-level.rs
diff --git a/src/test/ui/check-cfg/allow-same-level.stderr b/tests/ui/check-cfg/allow-same-level.stderr
index 7797de584..7797de584 100644
--- a/src/test/ui/check-cfg/allow-same-level.stderr
+++ b/tests/ui/check-cfg/allow-same-level.stderr
diff --git a/src/test/ui/check-cfg/allow-top-level.rs b/tests/ui/check-cfg/allow-top-level.rs
index d14b0eae5..d14b0eae5 100644
--- a/src/test/ui/check-cfg/allow-top-level.rs
+++ b/tests/ui/check-cfg/allow-top-level.rs
diff --git a/src/test/ui/check-cfg/allow-upper-level.rs b/tests/ui/check-cfg/allow-upper-level.rs
index 04340694d..04340694d 100644
--- a/src/test/ui/check-cfg/allow-upper-level.rs
+++ b/tests/ui/check-cfg/allow-upper-level.rs
diff --git a/src/test/ui/check-cfg/compact-names.rs b/tests/ui/check-cfg/compact-names.rs
index bff807400..bff807400 100644
--- a/src/test/ui/check-cfg/compact-names.rs
+++ b/tests/ui/check-cfg/compact-names.rs
diff --git a/src/test/ui/check-cfg/compact-names.stderr b/tests/ui/check-cfg/compact-names.stderr
index f1fc4285a..f1fc4285a 100644
--- a/src/test/ui/check-cfg/compact-names.stderr
+++ b/tests/ui/check-cfg/compact-names.stderr
diff --git a/src/test/ui/check-cfg/compact-values.rs b/tests/ui/check-cfg/compact-values.rs
index 1f1705784..1f1705784 100644
--- a/src/test/ui/check-cfg/compact-values.rs
+++ b/tests/ui/check-cfg/compact-values.rs
diff --git a/src/test/ui/check-cfg/compact-values.stderr b/tests/ui/check-cfg/compact-values.stderr
index 9864aa385..9864aa385 100644
--- a/src/test/ui/check-cfg/compact-values.stderr
+++ b/tests/ui/check-cfg/compact-values.stderr
diff --git a/src/test/ui/check-cfg/empty-names.rs b/tests/ui/check-cfg/empty-names.rs
index 046ff0364..046ff0364 100644
--- a/src/test/ui/check-cfg/empty-names.rs
+++ b/tests/ui/check-cfg/empty-names.rs
diff --git a/src/test/ui/check-cfg/empty-names.stderr b/tests/ui/check-cfg/empty-names.stderr
index f926d1133..f926d1133 100644
--- a/src/test/ui/check-cfg/empty-names.stderr
+++ b/tests/ui/check-cfg/empty-names.stderr
diff --git a/src/test/ui/check-cfg/empty-values.rs b/tests/ui/check-cfg/empty-values.rs
index 9bda42e5d..9bda42e5d 100644
--- a/src/test/ui/check-cfg/empty-values.rs
+++ b/tests/ui/check-cfg/empty-values.rs
diff --git a/src/test/ui/check-cfg/empty-values.stderr b/tests/ui/check-cfg/empty-values.stderr
index a0168b2ca..a0168b2ca 100644
--- a/src/test/ui/check-cfg/empty-values.stderr
+++ b/tests/ui/check-cfg/empty-values.stderr
diff --git a/src/test/ui/check-cfg/invalid-arguments.anything_else.stderr b/tests/ui/check-cfg/invalid-arguments.anything_else.stderr
index 850924d99..850924d99 100644
--- a/src/test/ui/check-cfg/invalid-arguments.anything_else.stderr
+++ b/tests/ui/check-cfg/invalid-arguments.anything_else.stderr
diff --git a/src/test/ui/check-cfg/invalid-arguments.names_simple_ident.stderr b/tests/ui/check-cfg/invalid-arguments.names_simple_ident.stderr
index 8fadcc1f9..8fadcc1f9 100644
--- a/src/test/ui/check-cfg/invalid-arguments.names_simple_ident.stderr
+++ b/tests/ui/check-cfg/invalid-arguments.names_simple_ident.stderr
diff --git a/src/test/ui/check-cfg/invalid-arguments.rs b/tests/ui/check-cfg/invalid-arguments.rs
index 5090ce3e8..5090ce3e8 100644
--- a/src/test/ui/check-cfg/invalid-arguments.rs
+++ b/tests/ui/check-cfg/invalid-arguments.rs
diff --git a/src/test/ui/check-cfg/invalid-arguments.values_simple_ident.stderr b/tests/ui/check-cfg/invalid-arguments.values_simple_ident.stderr
index 061d3f0e9..061d3f0e9 100644
--- a/src/test/ui/check-cfg/invalid-arguments.values_simple_ident.stderr
+++ b/tests/ui/check-cfg/invalid-arguments.values_simple_ident.stderr
diff --git a/src/test/ui/check-cfg/invalid-arguments.values_string_literals.stderr b/tests/ui/check-cfg/invalid-arguments.values_string_literals.stderr
index 5853b4741..5853b4741 100644
--- a/src/test/ui/check-cfg/invalid-arguments.values_string_literals.stderr
+++ b/tests/ui/check-cfg/invalid-arguments.values_string_literals.stderr
diff --git a/src/test/ui/check-cfg/invalid-cfg-name.rs b/tests/ui/check-cfg/invalid-cfg-name.rs
index 8499d3d44..8499d3d44 100644
--- a/src/test/ui/check-cfg/invalid-cfg-name.rs
+++ b/tests/ui/check-cfg/invalid-cfg-name.rs
diff --git a/src/test/ui/check-cfg/invalid-cfg-name.stderr b/tests/ui/check-cfg/invalid-cfg-name.stderr
index 2bd1821c9..2bd1821c9 100644
--- a/src/test/ui/check-cfg/invalid-cfg-name.stderr
+++ b/tests/ui/check-cfg/invalid-cfg-name.stderr
diff --git a/src/test/ui/check-cfg/invalid-cfg-value.rs b/tests/ui/check-cfg/invalid-cfg-value.rs
index 9e428d367..9e428d367 100644
--- a/src/test/ui/check-cfg/invalid-cfg-value.rs
+++ b/tests/ui/check-cfg/invalid-cfg-value.rs
diff --git a/src/test/ui/check-cfg/invalid-cfg-value.stderr b/tests/ui/check-cfg/invalid-cfg-value.stderr
index 60abcb188..60abcb188 100644
--- a/src/test/ui/check-cfg/invalid-cfg-value.stderr
+++ b/tests/ui/check-cfg/invalid-cfg-value.stderr
diff --git a/src/test/ui/check-cfg/mix.rs b/tests/ui/check-cfg/mix.rs
index 4e488fc03..4e488fc03 100644
--- a/src/test/ui/check-cfg/mix.rs
+++ b/tests/ui/check-cfg/mix.rs
diff --git a/src/test/ui/check-cfg/mix.stderr b/tests/ui/check-cfg/mix.stderr
index 9cf887ec7..9cf887ec7 100644
--- a/src/test/ui/check-cfg/mix.stderr
+++ b/tests/ui/check-cfg/mix.stderr
diff --git a/src/test/ui/check-cfg/no-values.rs b/tests/ui/check-cfg/no-values.rs
index 8c80f56cb..8c80f56cb 100644
--- a/src/test/ui/check-cfg/no-values.rs
+++ b/tests/ui/check-cfg/no-values.rs
diff --git a/src/test/ui/check-cfg/no-values.stderr b/tests/ui/check-cfg/no-values.stderr
index 8c926d187..8c926d187 100644
--- a/src/test/ui/check-cfg/no-values.stderr
+++ b/tests/ui/check-cfg/no-values.stderr
diff --git a/src/test/ui/check-cfg/stmt-no-ice.rs b/tests/ui/check-cfg/stmt-no-ice.rs
index cf76487ed..cf76487ed 100644
--- a/src/test/ui/check-cfg/stmt-no-ice.rs
+++ b/tests/ui/check-cfg/stmt-no-ice.rs
diff --git a/src/test/ui/check-cfg/stmt-no-ice.stderr b/tests/ui/check-cfg/stmt-no-ice.stderr
index da65b5969..da65b5969 100644
--- a/src/test/ui/check-cfg/stmt-no-ice.stderr
+++ b/tests/ui/check-cfg/stmt-no-ice.stderr
diff --git a/src/test/ui/check-cfg/well-known-names.rs b/tests/ui/check-cfg/well-known-names.rs
index e57fb69a1..e57fb69a1 100644
--- a/src/test/ui/check-cfg/well-known-names.rs
+++ b/tests/ui/check-cfg/well-known-names.rs
diff --git a/src/test/ui/check-cfg/well-known-names.stderr b/tests/ui/check-cfg/well-known-names.stderr
index bdbe4d29d..bdbe4d29d 100644
--- a/src/test/ui/check-cfg/well-known-names.stderr
+++ b/tests/ui/check-cfg/well-known-names.stderr
diff --git a/src/test/ui/check-cfg/well-known-values.rs b/tests/ui/check-cfg/well-known-values.rs
index 96375dc8d..96375dc8d 100644
--- a/src/test/ui/check-cfg/well-known-values.rs
+++ b/tests/ui/check-cfg/well-known-values.rs
diff --git a/src/test/ui/check-cfg/well-known-values.stderr b/tests/ui/check-cfg/well-known-values.stderr
index 29ececea5..69d799783 100644
--- a/src/test/ui/check-cfg/well-known-values.stderr
+++ b/tests/ui/check-cfg/well-known-values.stderr
@@ -6,7 +6,7 @@ LL | #[cfg(target_os = "linuz")]
    |                   |
    |                   help: did you mean: `"linux"`
    |
-   = note: expected values for `target_os` are: aix, android, cuda, dragonfly, emscripten, espidf, freebsd, fuchsia, haiku, hermit, horizon, illumos, ios, l4re, linux, macos, netbsd, none, nto, openbsd, psp, redox, solaris, solid_asp3, tvos, uefi, unknown, vxworks, wasi, watchos, windows, xous
+   = note: expected values for `target_os` are: aix, android, cuda, dragonfly, emscripten, espidf, freebsd, fuchsia, haiku, hermit, horizon, illumos, ios, l4re, linux, macos, netbsd, none, nto, openbsd, psp, redox, solaris, solid_asp3, tvos, uefi, unknown, vita, vxworks, wasi, watchos, windows, xous
    = note: `#[warn(unexpected_cfgs)]` on by default
 
 warning: unexpected `cfg` condition value