Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 20 deletions

diff --git a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs b/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs
deleted file mode 100644
index f5a97eca2..000000000
--- a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// edition:2021
-#![allow(unused_macros)]
-macro_rules! foo { ($x:pat | $y:pat) => {} } //~ ERROR `$x:pat` is followed by `|`, which is not allowed for `pat` fragments
-macro_rules! bar { ($($x:pat)+ | $($y:pat)+) => {} } //~ ERROR `$x:pat` is followed by `|`, which is not allowed for `pat` fragments
-macro_rules! qux { ($x:pat, $y:pat) => {} } // should be ok
-macro_rules! match_any {
-    ( $expr:expr , $( $( $pat:pat )|+ => $expr_arm:expr ),+ ) => { //~ ERROR `$pat:pat` may be followed by `|`, which is not allowed for `pat` fragments
-        match $expr {
-            $(
-                $( $pat => $expr_arm, )+
-            )+
-        }
-    };
-}
-
-fn main() {
-    let result: Result<i64, i32> = Err(42);
-    let int: i64 = match_any!(result, Ok(i) | Err(i) => i.into());
-    assert_eq!(int, 42);
-}