Move Veloren to 2021 edition

client/Cargo.toml

@@ -2,7 +2,7 @@
 name = "veloren-client"
 version = "0.11.0"
 authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 simd = ["vek/platform_intrinsics"]

common/base/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-common-base"
 description = "minimal dependency for crates to now depend on whole common"
 version = "0.10.0"

common/ecs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-common-ecs"
 version = "0.10.0"
 

common/frontend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Marcel Märtens <marcel.cochem@googlemail.com>", "Imbris <imbrisf@gmail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-common-frontend"
 description = "common stuff that is used by server-cli and voxygen directly"
 version = "0.10.0"

common/net/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-common-net"
 version = "0.10.0"
 

common/state/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-common-state"
 version = "0.10.0"
 

common/systems/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-common-systems"
 version = "0.10.0"
 

network/Cargo.toml

@@ -2,7 +2,7 @@
 name = "veloren-network"
 version = "0.3.0"
 authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

network/protocol/Cargo.toml

@@ -3,7 +3,7 @@ name = "veloren-network-protocol"
 description = "pure Protocol without any I/O itself"
 version = "0.6.0"
 authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

network/protocol/src/handshake.rs

@@ -172,6 +172,7 @@ mod tests {
         let [mut p1, p2] = ac_bound(10, None);
         let r1 = tokio::spawn(async move { p1.initialize(true, Pid::fake(2), 1337).await });
         let r2 = tokio::spawn(async move {
+            let _ = &p2;
             let _ = p2;
         });
         let (r1, _) = tokio::join!(r1, r2);

plugin/api/Cargo.toml

@@ -2,7 +2,7 @@
 name = "veloren-plugin-api"
 version = "0.1.0"
 authors = ["ccgauche <gaucheron.laurent@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.118", features = ["derive"] }

plugin/derive/Cargo.toml

@@ -2,7 +2,7 @@
 name = "veloren-plugin-derive"
 version = "0.1.0"
 authors = ["ccgauche <gaucheron.laurent@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

plugin/rt/Cargo.toml

@@ -2,7 +2,7 @@
 name = "veloren-plugin-rt"
 version = "0.1.0"
 authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 plugin-api = { package = "veloren-plugin-api", path = "../api" }

server-cli/Cargo.toml

@@ -2,7 +2,7 @@
 name = "veloren-server-cli"
 version = "0.11.0"
 authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.nix]
 build = true

voxygen/anim/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Imbris <imbrisf@gmail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-voxygen-anim"
 version = "0.10.0"
 

voxygen/anim/dyn/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Imbris <imbrisf@gmail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-voxygen-anim-dyn"
 version = "0.10.0"
 

voxygen/dynlib/Cargo.toml

@@ -2,7 +2,7 @@
 name = "veloren-voxygen-dynlib"
 version = "0.1.0"
 authors = ["Ben Wallis <atomyc@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 find_folder = {version = "0.3.0"}

voxygen/egui/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Ben Wallis <atomyc@gmail.com>"]
 name = "veloren-voxygen-egui"
-edition = "2018"
+edition = "2021"
 version = "0.9.0"
 
 [features]

voxygen/egui/dyn/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Imbris <imbrisf@gmail.com>"]
-edition = "2018"
+edition = "2021"
 name = "veloren-voxygen-egui-dyn"
 version = "0.9.0"