move to rust 2021, tweak macro (#428)

* cargo fix --edition

* move to rust 2021

* simplify macro now that patterns are supported natively

Co-authored-by: James Wilson <james@jsdw.me>

backend/common/Cargo.toml

@@ -2,7 +2,7 @@
 name = "common"
 version = "0.1.0"
 authors = ["Parity Technologies Ltd. <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 
 [dependencies]

backend/telemetry_core/Cargo.toml

@@ -2,7 +2,7 @@
 name = "telemetry_core"
 version = "0.1.0"
 authors = ["Parity Technologies Ltd. <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 
 [dependencies]

backend/telemetry_shard/Cargo.toml

@@ -2,7 +2,7 @@
 name = "telemetry_shard"
 version = "0.1.0"
 authors = ["Parity Technologies Ltd. <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 
 [dependencies]

backend/test_utils/Cargo.toml

@@ -2,7 +2,7 @@
 name = "test_utils"
 version = "0.1.0"
 authors = ["James Wilson <james@jsdw.me>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

backend/test_utils/src/contains_matches.rs

@@ -43,14 +43,14 @@ assert!(does_contain);
 */
 #[macro_export]
 macro_rules! contains_matches {
-    ($expression:expr, $( $( $pattern:pat )|+ $( if $guard:expr )? ),+ $(,)?) => {{
+    ($expression:expr, $( $pattern:pat $( if $guard:expr )? ),+ $(,)?) => {{
         let mut items = $expression.into_iter();
 
         // For each pattern we want to match, we consume items until
         // we find the first match, and then break the loop and do the
         // same again with the next pattern. If we run out of items, we
         // set the validity to false and stop trying to match. Else, we
-        // match againse each of the patterns and return true.
+        // match against each of the patterns and return true.
         let mut is_valid = true;
         $(
             while is_valid {
@@ -63,7 +63,7 @@ macro_rules! contains_matches {
                 };
 
                 match item {
-                    $( $pattern )|+ $( if $guard )? => break,
+                    $pattern $( if $guard )? => break,
                     _ => continue
                 }
             }
@@ -99,10 +99,10 @@ test_utils::assert_contains_matches!(
 */
 #[macro_export]
 macro_rules! assert_contains_matches {
-    ($expression:expr, $( $( $pattern:pat )|+ $( if $guard:expr )? ),+ $(,)?) => {
+    ($expression:expr, $( $pattern:pat $( if $guard:expr )? ),+ $(,)?) => {
         let does_contain_matches = $crate::contains_matches!(
             $expression,
-            $( $( $pattern )|+ $( if $guard )? ),+
+            $( $pattern $( if $guard )? ),+
         );
 
         assert!(does_contain_matches);