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

Merge branch 'juliancoffee/start_2021' into 'master'

Browse Source 
Migrate Veloren to 2021 edition

See merge request veloren/veloren!3149
This commit is contained in:
Marcel 2022-01-26 15:56:29 +00:00
commit 728488502e
27 changed files with 29 additions and 30 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"
version = "0.11.0"
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>"]
edition = "2018"
edition = "2021"
[features]
simd = ["vek/platform_intrinsics"]

2
common/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "veloren-common"
version = "0.10.0"
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Maciej Ćwięka <mckol363@gmail.com>", "Imbris <imbrisf@gmail.com>"]
edition = "2018"
edition = "2021"
[features]
no-assets = []

2
common/assets/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
authors = ["juliancoffee <lightdarkdaughter@gmail.com>", "Marcel Märtens <marcel.cochem@googlemail.com>"]
edition = "2018"
edition = "2021"
name = "veloren-common-assets"
description = "Crate for game loading assets for veloren."
version = "0.10.0"

4
common/base/Cargo.toml
View File

@ -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"
@ -13,4 +13,4 @@ tracing = { version = "0.1", default-features = false }
directories-next = "2.0"
# 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]
authors = ["Marcel Märtens <marcel.cochem@googlemail.com>"]
edition = "2018"
edition = "2021"
name = "veloren-common-ecs"
version = "0.10.0"

2
common/frontend/Cargo.toml
View File

@ -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"

2
common/net/Cargo.toml
View File

@ -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"

2
common/state/Cargo.toml
View File

@ -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"

2
common/systems/Cargo.toml
View File

@ -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"

2
network/Cargo.toml
View File

@ -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

4
network/protocol/Cargo.toml
View File

@ -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
@ -33,4 +33,4 @@ criterion = { version = "0.3.4", features = ["default", "async_tokio"] }
[[bench]]
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 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);

4
plugin/api/Cargo.toml
View File

@ -2,9 +2,9 @@
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"] }
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"
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

2
plugin/rt/Cargo.toml
View File

@ -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" }

2
server-cli/Cargo.toml
View File

@ -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

2
server/Cargo.toml
View File

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

2
voxygen/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Imbris <imbrisf@gmail.com>"]
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

2
voxygen/anim/Cargo.toml
View File

@ -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"

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

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

2
voxygen/dynlib/Cargo.toml
View File

@ -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"}

2
voxygen/egui/Cargo.toml
View File

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

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

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

2
voxygen/i18n/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
authors = ["juliancoffee <lightdarkdaughter@gmail.com>", "Rémy Phelipot"]
edition = "2018"
edition = "2021"
name = "veloren-voxygen-i18n"
description = "Crate for internalization and diagnostic of existing localizations."
version = "0.10.0"

2
voxygen/src/scene/figure/load.rs
View File

@ -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 {

2
voxygen/src/ui/egui/mod.rs
View File

@ -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())

2
world/Cargo.toml
View File

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