From 1704f1b4cbde86f358261dc753484eb010ebb96c Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Wed, 21 Dec 2022 12:24:03 +0000
Subject: [PATCH] rust: Use 2021 eition

---
 Cargo.toml.in         |  2 +-
 src/assert_matches.rs | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml.in b/Cargo.toml.in
index e737146b..65b14f37 100644
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@@ -1,7 +1,7 @@
 [package]
 name = "rs"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "rs"
diff --git a/src/assert_matches.rs b/src/assert_matches.rs
index a7ef3c2d..15273bba 100644
--- a/src/assert_matches.rs
+++ b/src/assert_matches.rs
@@ -95,56 +95,56 @@ DEALINGS IN THE SOFTWARE.
 /// ```
 #[macro_export]
 macro_rules! assert_matches {
-    ( $e:expr , $($pat:pat)|+ ) => {
+    ( $e:expr , $($pat:pat_param)|+ ) => {
         match $e {
             $($pat)|+ => (),
             ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                 e, stringify!($($pat)|+))
         }
     };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr ) => {
         match $e {
             $($pat)|+ if $cond => (),
             ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                 e, stringify!($($pat)|+ if $cond))
         }
     };
-    ( $e:expr , $($pat:pat)|+ => $arm:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ => $arm:expr ) => {
         match $e {
             $($pat)|+ => $arm,
             ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                 e, stringify!($($pat)|+))
         }
     };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr => $arm:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr => $arm:expr ) => {
         match $e {
             $($pat)|+ if $cond => $arm,
             ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                 e, stringify!($($pat)|+ if $cond))
         }
     };
-    ( $e:expr , $($pat:pat)|+ , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ , $($arg:tt)* ) => {
         match $e {
             $($pat)|+ => (),
             ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                 e, stringify!($($pat)|+), format_args!($($arg)*))
         }
     };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr , $($arg:tt)* ) => {
         match $e {
             $($pat)|+ if $cond => (),
             ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                 e, stringify!($($pat)|+ if $cond), format_args!($($arg)*))
         }
     };
-    ( $e:expr , $($pat:pat)|+ => $arm:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ => $arm:expr , $($arg:tt)* ) => {
         match $e {
             $($pat)|+ => $arm,
             ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                 e, stringify!($($pat)|+), format_args!($($arg)*))
         }
     };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr => $arm:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr => $arm:expr , $($arg:tt)* ) => {
         match $e {
             $($pat)|+ if $cond => $arm,
             ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",