Upgrade packages to Rust 2021 (#412)

More modern edition of the compiler

Cargo.toml

@@ -11,6 +11,7 @@ members = [
     "crates/interval-tree",
     #"crates/spaceman-dmm",
 ]
+resolver = "2"
 
 [profile.dev]
 opt-level = 2

crates/builtins-proc-macro/Cargo.toml

@@ -2,7 +2,7 @@
 name = "builtins-proc-macro"
 version = "0.0.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true

crates/dap-types/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dap-types"
 version = "0.0.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde = "1.0.144"

crates/dm-langserver/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dm-langserver"
 version = "1.9.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 url = "2.3.1"

crates/dm-langserver/src/macros.rs

@@ -142,7 +142,7 @@ macro_rules! if_annotation {
 }
 
 macro_rules! match_annotation {
-    ($a:expr; $($($p:pat)|* => $b:block,)*) => {
+    ($a:expr; $($($p:pat_param)|* => $b:block,)*) => {
         for (_, thing) in $a.clone() {
             match thing {
                 $($($p)|* => $b,)*

crates/dmdoc/Cargo.toml

@@ -3,7 +3,7 @@ name = "dmdoc"
 version = "1.9.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
 homepage = "https://github.com/SpaceManiac/SpacemanDMM/blob/master/crates/dmdoc/README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 dreammaker = { path = "../dreammaker" }

crates/dmm-tools-cli/Cargo.toml

@@ -3,7 +3,7 @@ name = "dmm-tools-cli"
 version = "1.9.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
 description = "BYOND map rendering and analysis tools powered by SpacemanDMM"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "dmm-tools"

crates/dmm-tools/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dmm-tools"
 version = "0.1.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 inflate = "0.4.5"

crates/dreamchecker/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dreamchecker"
 version = "1.9.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 dreammaker = { path = "../dreammaker" }

crates/dreammaker/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dreammaker"
 version = "0.1.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 interval-tree = { path = "../interval-tree" }

crates/dreammaker/src/parser.rs

@@ -52,7 +52,7 @@ macro_rules! take_match {
     (
         $self:ident {
             $(
-                $($p:pat)|* $( if $condition:expr )? => $branch:expr,
+                $($p:pat_param)|* $( if $condition:expr )? => $branch:expr,
             )*
         }
         // else mandatory because you should never be matching on every option

crates/dreammaker/tests/format_tests.rs

@@ -26,8 +26,8 @@ fn floats() {
     assert_eq!(FormatFloat(0.000500001).to_string(), "0.000500001");
     assert_eq!(FormatFloat(0.0000500001).to_string(), "5.00001e-005");
 
-    assert_eq!(FormatFloat(std::f32::INFINITY).to_string(), "1.#INF");
-    assert_eq!(FormatFloat(-std::f32::INFINITY).to_string(), "-1.#INF");
+    assert_eq!(FormatFloat(f32::INFINITY).to_string(), "1.#INF");
+    assert_eq!(FormatFloat(-f32::INFINITY).to_string(), "-1.#INF");
 
     assert_eq!(FormatFloat(2.9).to_string(), "2.9");
     assert_eq!(FormatFloat(2.4).to_string(), "2.4");

crates/interval-tree/Cargo.toml

@@ -6,7 +6,7 @@ description = "A simple Interval Tree implementation"
 repository = "https://github.com/SpaceManiac/SpacemanDMM/tree/master/crates/interval-tree"
 keywords = ["datastructure", "interval", "tree", "map"]
 license-file = "LICENSE"
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 rand = "0.8.5"

crates/spaceman-dmm/Cargo.toml

@@ -2,7 +2,7 @@
 name = "spaceman-dmm"
 version = "0.1.0"
 authors = ["Tad Hardesty <tad@platymuus.com>"]
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "editor"