diff --git a/client/Cargo.toml b/client/Cargo.toml index d48889a0b3..de940799c8 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-client" version = "0.11.0" authors = ["Joshua Barretto "] -edition = "2018" +edition = "2021" [features] simd = ["vek/platform_intrinsics"] diff --git a/common/Cargo.toml b/common/Cargo.toml index e0c023cb93..842ead084e 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-common" version = "0.10.0" authors = ["Joshua Barretto ", "Maciej Ćwięka ", "Imbris "] -edition = "2018" +edition = "2021" [features] no-assets = [] diff --git a/common/assets/Cargo.toml b/common/assets/Cargo.toml index 92491bca90..3c11ceaae7 100644 --- a/common/assets/Cargo.toml +++ b/common/assets/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["juliancoffee ", "Marcel Märtens "] -edition = "2018" +edition = "2021" name = "veloren-common-assets" description = "Crate for game loading assets for veloren." version = "0.10.0" diff --git a/common/base/Cargo.toml b/common/base/Cargo.toml index 718426679d..96b3aa3ae8 100644 --- a/common/base/Cargo.toml +++ b/common/base/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Marcel Märtens "] -edition = "2018" +edition = "2021" name = "veloren-common-base" description = "minimal dependency for crates to now depend on whole common" version = "0.10.0" @@ -13,4 +13,4 @@ tracing = { version = "0.1", default-features = false } directories-next = "2.0" # Tracy -tracy-client = { version = "0.12.0", optional = true } \ No newline at end of file +tracy-client = { version = "0.12.0", optional = true } diff --git a/common/ecs/Cargo.toml b/common/ecs/Cargo.toml index 098c3fcb4f..4cc809e63c 100644 --- a/common/ecs/Cargo.toml +++ b/common/ecs/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Marcel Märtens "] -edition = "2018" +edition = "2021" name = "veloren-common-ecs" version = "0.10.0" diff --git a/common/frontend/Cargo.toml b/common/frontend/Cargo.toml index bd227a25a9..1cbc383a23 100644 --- a/common/frontend/Cargo.toml +++ b/common/frontend/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Marcel Märtens ", "Imbris "] -edition = "2018" +edition = "2021" name = "veloren-common-frontend" description = "common stuff that is used by server-cli and voxygen directly" version = "0.10.0" diff --git a/common/net/Cargo.toml b/common/net/Cargo.toml index 74ae0304d4..a6c6c23941 100644 --- a/common/net/Cargo.toml +++ b/common/net/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Marcel Märtens "] -edition = "2018" +edition = "2021" name = "veloren-common-net" version = "0.10.0" diff --git a/common/state/Cargo.toml b/common/state/Cargo.toml index 351a8b7a83..8b36136c3d 100644 --- a/common/state/Cargo.toml +++ b/common/state/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Marcel Märtens "] -edition = "2018" +edition = "2021" name = "veloren-common-state" version = "0.10.0" diff --git a/common/systems/Cargo.toml b/common/systems/Cargo.toml index 23cc60178e..7c52fe32f9 100644 --- a/common/systems/Cargo.toml +++ b/common/systems/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Marcel Märtens "] -edition = "2018" +edition = "2021" name = "veloren-common-systems" version = "0.10.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 63c89c501e..71b6d332f1 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-network" version = "0.3.0" authors = ["Marcel Märtens "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/network/protocol/Cargo.toml b/network/protocol/Cargo.toml index 6d597d4699..2207d919f8 100644 --- a/network/protocol/Cargo.toml +++ b/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 "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -33,4 +33,4 @@ criterion = { version = "0.3.4", features = ["default", "async_tokio"] } [[bench]] name = "protocols" -harness = false \ No newline at end of file +harness = false diff --git a/network/protocol/src/handshake.rs b/network/protocol/src/handshake.rs index 2c524d5241..d02920e044 100644 --- a/network/protocol/src/handshake.rs +++ b/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); diff --git a/plugin/api/Cargo.toml b/plugin/api/Cargo.toml index 7f75aaeef8..58a8012a38 100644 --- a/plugin/api/Cargo.toml +++ b/plugin/api/Cargo.toml @@ -2,9 +2,9 @@ name = "veloren-plugin-api" version = "0.1.0" authors = ["ccgauche "] -edition = "2018" +edition = "2021" [dependencies] serde = { version = "1.0.118", features = ["derive"] } common = { package = "veloren-common", path = "../../common", features = ["no-assets"] } -bincode = "1.3.1" \ No newline at end of file +bincode = "1.3.1" diff --git a/plugin/derive/Cargo.toml b/plugin/derive/Cargo.toml index f6a9e882ad..60be27c836 100644 --- a/plugin/derive/Cargo.toml +++ b/plugin/derive/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-plugin-derive" version = "0.1.0" authors = ["ccgauche "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/plugin/rt/Cargo.toml b/plugin/rt/Cargo.toml index ec216fb887..5a4a226a79 100644 --- a/plugin/rt/Cargo.toml +++ b/plugin/rt/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-plugin-rt" version = "0.1.0" authors = ["Joshua Barretto "] -edition = "2018" +edition = "2021" [dependencies] plugin-api = { package = "veloren-plugin-api", path = "../api" } diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index ab919077ea..9998185a64 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-server-cli" version = "0.11.0" authors = ["Joshua Barretto "] -edition = "2018" +edition = "2021" [package.metadata.nix] build = true diff --git a/server/Cargo.toml b/server/Cargo.toml index 85be372d3a..41a40d8bcb 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-server" version = "0.11.0" authors = ["Joshua Barretto "] -edition = "2018" +edition = "2021" [features] worldgen = [] diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index becf603e3b..2a10a23fb7 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Joshua Barretto ", "Imbris "] default-run = "veloren-voxygen" -edition = "2018" +edition = "2021" name = "veloren-voxygen" version = "0.11.0" # Cargo thinks it should build the voxygen binary even when a specific bench is specified for building diff --git a/voxygen/anim/Cargo.toml b/voxygen/anim/Cargo.toml index 5081c532b8..74520faeb5 100644 --- a/voxygen/anim/Cargo.toml +++ b/voxygen/anim/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Joshua Barretto ", "Imbris "] -edition = "2018" +edition = "2021" name = "veloren-voxygen-anim" version = "0.10.0" diff --git a/voxygen/anim/dyn/Cargo.toml b/voxygen/anim/dyn/Cargo.toml index 6bf01bc546..b50031ceae 100644 --- a/voxygen/anim/dyn/Cargo.toml +++ b/voxygen/anim/dyn/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Imbris "] -edition = "2018" +edition = "2021" name = "veloren-voxygen-anim-dyn" version = "0.10.0" diff --git a/voxygen/dynlib/Cargo.toml b/voxygen/dynlib/Cargo.toml index 2de70bd48a..5eccc940d9 100644 --- a/voxygen/dynlib/Cargo.toml +++ b/voxygen/dynlib/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-voxygen-dynlib" version = "0.1.0" authors = ["Ben Wallis "] -edition = "2018" +edition = "2021" [dependencies] find_folder = {version = "0.3.0"} diff --git a/voxygen/egui/Cargo.toml b/voxygen/egui/Cargo.toml index 29b246f246..1a32adbf90 100644 --- a/voxygen/egui/Cargo.toml +++ b/voxygen/egui/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Ben Wallis "] name = "veloren-voxygen-egui" -edition = "2018" +edition = "2021" version = "0.9.0" [features] diff --git a/voxygen/egui/dyn/Cargo.toml b/voxygen/egui/dyn/Cargo.toml index d4865fcacb..a986b844d2 100644 --- a/voxygen/egui/dyn/Cargo.toml +++ b/voxygen/egui/dyn/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Imbris "] -edition = "2018" +edition = "2021" name = "veloren-voxygen-egui-dyn" version = "0.9.0" diff --git a/voxygen/i18n/Cargo.toml b/voxygen/i18n/Cargo.toml index 66cc2c8276..8f95be742c 100644 --- a/voxygen/i18n/Cargo.toml +++ b/voxygen/i18n/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["juliancoffee ", "Rémy Phelipot"] -edition = "2018" +edition = "2021" name = "veloren-voxygen-i18n" description = "Crate for internalization and diagnostic of existing localizations." version = "0.10.0" diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 57a4bc6d27..367d9c03a4 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -117,7 +117,7 @@ macro_rules! make_vox_spec { ( $body:ty, struct $Spec:ident { $( $(+)? $field:ident: $ty:ty = $asset_path:literal),* $(,)? }, - |$self_pat:pat, $spec_pat:pat| $bone_meshes:block $(,)? + |$self_pat:pat, $spec_pat:pat_param| $bone_meshes:block $(,)? ) => { #[derive(Clone)] pub struct $Spec { diff --git a/voxygen/src/ui/egui/mod.rs b/voxygen/src/ui/egui/mod.rs index 29c6e7d420..7c21a2e12d 100644 --- a/voxygen/src/ui/egui/mod.rs +++ b/voxygen/src/ui/egui/mod.rs @@ -90,8 +90,6 @@ impl EguiState { }, }, EguiAction::SetExperimentalShader(shader, enabled) => { - // TODO Rust 2021 - use core::convert::TryFrom; if let Ok(shader) = ExperimentalShader::try_from(shader.as_str()) { let shaders = &mut new_render_mode .get_or_insert_with(|| settings.graphics.render_mode.clone()) diff --git a/world/Cargo.toml b/world/Cargo.toml index d33ee053b5..22a046a5aa 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -2,7 +2,7 @@ name = "veloren-world" version = "0.10.0" authors = ["Joshua Barretto "] -edition = "2018" +edition = "2021" [features] simd = ["vek/platform_intrinsics", "packed_simd"]