From 12995ff2120bc86997658d02e5250e6fa06f63fe Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 27 Apr 2022 21:49:20 +0100
Subject: [PATCH] Switch to Rust 2021

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Cargo.toml         | 3 ++-
 apitest/Cargo.toml | 3 ++-
 base/Cargo.toml    | 3 ++-
 cli/Cargo.toml     | 3 ++-
 daemon/Cargo.toml  | 3 ++-
 jstest/Cargo.toml  | 3 ++-
 src/utils.rs       | 4 ++--
 wasm/Cargo.toml    | 3 ++-
 wdriver/Cargo.toml | 3 ++-
 9 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ab5799d2..4d4ff58c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,8 @@ description="Otter game system; common infrastructure Rust crate."
 
 version="1.0.0"
 license="AGPL-3.0-or-later"
-edition="2018"
+edition="2021"
+resolver="1" # new resolver crashes!
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/"
 repository="https://salsa.debian.org/iwj/otter"
 keywords=["games"]
diff --git a/apitest/Cargo.toml b/apitest/Cargo.toml
index d00c4c7d..c783f2e6 100644
--- a/apitest/Cargo.toml
+++ b/apitest/Cargo.toml
@@ -8,7 +8,8 @@ description="Otter game system; API tests crates."
 
 version="1.0.0"
 license="AGPL-3.0-or-later"
-edition="2018"
+edition="2021"
+resolver="1" # new resolver crashes!
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/"
 repository="https://salsa.debian.org/iwj/otter"
 keywords=["games"]
diff --git a/base/Cargo.toml b/base/Cargo.toml
index 1ce4937e..e2db245e 100644
--- a/base/Cargo.toml
+++ b/base/Cargo.toml
@@ -8,7 +8,8 @@ description="Otter game system; WASM/hostside common code crate."
 
 version="1.0.0"
 license="AGPL-3.0-or-later"
-edition="2018"
+edition="2021"
+resolver="1" # new resolver crashes!
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/"
 repository="https://salsa.debian.org/iwj/otter"
 keywords=["games"]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index b44a3ff3..0a73bb50 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -8,7 +8,8 @@ description="Otter game system; command line game management client."
 
 version="1.0.0"
 license="AGPL-3.0-or-later"
-edition="2018"
+edition="2021"
+resolver="1" # new resolver crashes!
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/"
 repository="https://salsa.debian.org/iwj/otter"
 keywords=["games"]
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index c03d391b..ca94862e 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -8,7 +8,8 @@ description="Otter game system; server executable crate."
 
 version="1.0.0"
 license="AGPL-3.0-or-later"
-edition="2018"
+edition="2021"
+resolver="1" # new resolver crashes!
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/"
 repository="https://salsa.debian.org/iwj/otter"
 keywords=["games"]
diff --git a/jstest/Cargo.toml b/jstest/Cargo.toml
index 1327b46f..5c8e0be7 100644
--- a/jstest/Cargo.toml
+++ b/jstest/Cargo.toml
@@ -8,7 +8,8 @@ description="Otter game system; JavaScript out-of-browser test support."
 
 version="1.0.0"
 license="AGPL-3.0-or-later"
-edition="2018"
+edition="2021"
+resolver="1" # new resolver crashes!
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/"
 repository="https://salsa.debian.org/iwj/otter"
 keywords=["games"]
diff --git a/src/utils.rs b/src/utils.rs
index 8fb3705a..5fb808ef 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -284,12 +284,12 @@ macro_rules! matches_doesnot_yn2bool {
 macro_rules! matches_doesnot {
   ($v:expr,
    $(
-     $yn:tt $($p:pat)|*
+     $yn:tt $p:pat
    ),* $(,)?
   ) => {
     match $v {
       $(
-        $($p)|* => $crate::matches_doesnot_yn2bool!($yn),
+        $p => $crate::matches_doesnot_yn2bool!($yn),
       )*
     }
   }
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index 5bcff56f..e66b09c7 100644
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -8,7 +8,8 @@ description="Otter game system; Rust WASM crate."
 
 version="1.0.0"
 license="AGPL-3.0-or-later"
-edition="2018"
+edition="2021"
+resolver="1" # new resolver crashes!
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/"
 repository="https://salsa.debian.org/iwj/otter"
 keywords=["games"]
diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 77f49663..acd811c7 100644
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -8,7 +8,8 @@ description="Otter game system; API tests crate."
 
 version="1.0.0"
 license="AGPL-3.0-or-later"
-edition="2018"
+edition="2021"
+resolver="1" # new resolver crashes!
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/"
 repository="https://salsa.debian.org/iwj/otter"
 keywords=["games"]
-- 
2.30.2