Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Veloren to 2021 edition

Browse Source
This commit is contained in:
juliancoffee 2022-01-26 16:46:40 +02:00
parent 4fe5fdad4a
commit fba89517de
19 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/Cargo.toml
View File

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

4
common/base/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"] authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
edition = "2018" edition = "2021"
name = "veloren-common-base" name = "veloren-common-base"
description = "minimal dependency for crates to now depend on whole common" description = "minimal dependency for crates to now depend on whole common"
version = "0.10.0" version = "0.10.0"
@ -13,4 +13,4 @@ tracing = { version = "0.1", default-features = false }
directories-next = "2.0" directories-next = "2.0"
# Tracy # Tracy
tracy-client = { version = "0.12.0", optional = true } tracy-client = { version = "0.12.0", optional = true }

2
common/ecs/Cargo.toml
View File

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

2
common/frontend/Cargo.toml
View File

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

2
common/net/Cargo.toml
View File

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

2
common/state/Cargo.toml
View File

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

2
common/systems/Cargo.toml
View File

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

2
network/Cargo.toml
View File

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

4
network/protocol/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "veloren-network-protocol"
description = "pure Protocol without any I/O itself" description = "pure Protocol without any I/O itself"
version = "0.6.0" version = "0.6.0"
authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"] 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 # 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]] [[bench]]
name = "protocols" name = "protocols"
harness = false harness = false

1
network/protocol/src/handshake.rs
View File

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

4
plugin/api/Cargo.toml
View File

@ -2,9 +2,9 @@
name = "veloren-plugin-api" name = "veloren-plugin-api"
version = "0.1.0" version = "0.1.0"
authors = ["ccgauche <gaucheron.laurent@gmail.com>"] authors = ["ccgauche <gaucheron.laurent@gmail.com>"]
edition = "2018" edition = "2021"
[dependencies] [dependencies]
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.118", features = ["derive"] }
common = { package = "veloren-common", path = "../../common", features = ["no-assets"] } common = { package = "veloren-common", path = "../../common", features = ["no-assets"] }
bincode = "1.3.1" bincode = "1.3.1"

2
plugin/derive/Cargo.toml
View File

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

2
plugin/rt/Cargo.toml
View File

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

2
server-cli/Cargo.toml
View File

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

2
voxygen/anim/Cargo.toml
View File

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

2
voxygen/anim/dyn/Cargo.toml
View File

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

2
voxygen/dynlib/Cargo.toml
View File

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

2
voxygen/egui/Cargo.toml
View File

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

2
voxygen/egui/dyn/Cargo.toml
View File

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