Switch to Rust 2021

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Cargo.toml b/Cargo.toml
index ab5799d20c43a48986619d100b4b9635203bd30a..4d4ff58c9259bba4c26168b24882e056bcfd4f70 100644 (file)
--- 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 d00c4c7df60f363d40d274d0f78f7400fecc434f..c783f2e69da791b48c82d56c066eaa8b28dfeee6 100644 (file)
--- 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 1ce4937efe6de1f9b5ef4f9111d41b71a7610897..e2db245ea77b32b7bdddd29bebf0641f8229a1e6 100644 (file)
--- 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 b44a3ff3f07dcaa7b04a61871b179541c348e681..0a73bb5063c777513adb5c4eb2f1e054b450aa2f 100644 (file)
--- 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 c03d391b31f2a1344ad339eecbafb9b7915c01d9..ca94862e6192f5c6c0d911a2659e7edde4ddd50f 100644 (file)
--- 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 1327b46f7daf77d51ddca76d5779ee4854bbc8dd..5c8e0be7a19703045a0dcbacf04585b6fe9aa62a 100644 (file)
--- 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 8fb3705ad8a1d462e690ae8ea404b404eeae86c4..5fb808efbc5a5a13f74010c3be5ef4b83edab1bb 100644 (file)
--- 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 5bcff56f61d17d0a69aa29411e3e736091311c6c..e66b09c72ae8dcb2cae9386f85d28b68edc9d65a 100644 (file)
--- 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 77f496636661daa2a5226e8eaf19a161d9ea2af8..acd811c7b07cdcc510eae6644fd6b148c5cc3155 100644 (file)
--- 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"]