mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Move Veloren to 2021 edition
This commit is contained in:
parent
4fe5fdad4a
commit
fba89517de
@ -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"]
|
||||||
|
@ -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"
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -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"
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -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,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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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);
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
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"] }
|
||||||
|
@ -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,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,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
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -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,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"}
|
||||||
|
@ -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]
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user