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

update toolchain to 2024-05-14

Browse Source
This commit is contained in:
Marcel Märtens 2024-05-18 00:58:54 +02:00
parent e63b42645f
commit 5f41aefacb
17 changed files with 39 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.cargo/config → .cargo/config.toml
View File

66
Cargo.lock generated
View File

@ -45,17 +45,6 @@ version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
[[package]]
name = "ahash"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
dependencies = [
"getrandom 0.2.12",
"once_cell",
"version_check",
]
[[package]] [[package]]
name = "ahash" name = "ahash"
version = "0.8.11" version = "0.8.11"
@ -4473,16 +4462,6 @@ dependencies = [
"ttf-parser", "ttf-parser",
] ]
[[package]]
name = "packed_simd"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d"
dependencies = [
"cfg-if 1.0.0",
"num-traits",
]
[[package]] [[package]]
name = "parking" name = "parking"
version = "2.2.0" version = "2.2.0"
@ -5794,8 +5773,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]] [[package]]
name = "shred" name = "shred"
version = "0.15.0" version = "0.16.1"
source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "656294f5bdcf6d33f0cf89e88a72b58595e3fca0e77e4a4b9e9026179757fb1e"
dependencies = [ dependencies = [
"ahash 0.8.11", "ahash 0.8.11",
"arrayvec", "arrayvec",
@ -5808,8 +5788,9 @@ dependencies = [
[[package]] [[package]]
name = "shred-derive" name = "shred-derive"
version = "0.6.3" version = "0.7.0"
source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69760b786f8b40361c10663eb63c81fa7d828008527d26aa7595b99c53ab3a8d"
dependencies = [ dependencies = [
"proc-macro2 1.0.79", "proc-macro2 1.0.79",
"quote 1.0.35", "quote 1.0.35",
@ -5943,10 +5924,9 @@ dependencies = [
[[package]] [[package]]
name = "specs" name = "specs"
version = "0.20.0" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27#4e2da1df29ee840baa9b936593c45592b7c9ae27"
checksum = "a60eabdfd5a80e458c3e7bcc9f1076d6ce3cc8ddb71d69691f00fc0de735a635"
dependencies = [ dependencies = [
"ahash 0.7.8", "ahash 0.8.11",
"crossbeam-queue", "crossbeam-queue",
"hibitset", "hibitset",
"log", "log",
@ -5962,8 +5942,7 @@ dependencies = [
[[package]] [[package]]
name = "specs-derive" name = "specs-derive"
version = "0.4.1" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27#4e2da1df29ee840baa9b936593c45592b7c9ae27"
checksum = "3e23e09360f3d2190fec4222cd9e19d3158d5da948c0d1ea362df617dd103511"
dependencies = [ dependencies = [
"proc-macro2 1.0.79", "proc-macro2 1.0.79",
"quote 1.0.35", "quote 1.0.35",
@ -6816,9 +6795,9 @@ dependencies = [
[[package]] [[package]]
name = "vek" name = "vek"
version = "0.16.1" version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85158043f3bc1fac596d59a77e07948da340b9951b451ed4cb4a8c480aa2157" checksum = "cb40015035f83ba23d647e647f8be060d0f6f99b7c7687989fbca3e3d65e7234"
dependencies = [ dependencies = [
"approx 0.5.1", "approx 0.5.1",
"num-integer", "num-integer",
@ -6848,7 +6827,7 @@ dependencies = [
"specs", "specs",
"tokio", "tokio",
"tracing", "tracing",
"vek 0.16.1", "vek 0.17.0",
"veloren-client-i18n", "veloren-client-i18n",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
@ -6919,7 +6898,7 @@ dependencies = [
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"uuid", "uuid",
"vek 0.16.1", "vek 0.17.0",
"veloren-common-assets", "veloren-common-assets",
"veloren-common-base", "veloren-common-base",
"veloren-common-i18n", "veloren-common-i18n",
@ -7004,7 +6983,7 @@ dependencies = [
"specs", "specs",
"sum_type", "sum_type",
"tracing", "tracing",
"vek 0.16.1", "vek 0.17.0",
"veloren-common", "veloren-common",
] ]
@ -7028,7 +7007,7 @@ dependencies = [
"timer-queue", "timer-queue",
"toml 0.8.12", "toml 0.8.12",
"tracing", "tracing",
"vek 0.16.1", "vek 0.17.0",
"veloren-common", "veloren-common",
"veloren-common-assets", "veloren-common-assets",
"veloren-common-base", "veloren-common-base",
@ -7048,7 +7027,7 @@ dependencies = [
"rayon", "rayon",
"specs", "specs",
"tracing", "tracing",
"vek 0.16.1", "vek 0.17.0",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-ecs", "veloren-common-ecs",
@ -7132,7 +7111,7 @@ dependencies = [
"serde", "serde",
"slotmap", "slotmap",
"tracing", "tracing",
"vek 0.16.1", "vek 0.17.0",
"veloren-common", "veloren-common",
"veloren-world", "veloren-world",
] ]
@ -7175,7 +7154,7 @@ dependencies = [
"strum 0.24.1", "strum 0.24.1",
"tokio", "tokio",
"tracing", "tracing",
"vek 0.16.1", "vek 0.17.0",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-ecs", "veloren-common-ecs",
@ -7198,7 +7177,7 @@ dependencies = [
"rand 0.8.5", "rand 0.8.5",
"specs", "specs",
"tracing", "tracing",
"vek 0.16.1", "vek 0.17.0",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-dynlib", "veloren-common-dynlib",
@ -7296,7 +7275,7 @@ dependencies = [
"tokio", "tokio",
"tracing", "tracing",
"treeculler", "treeculler",
"vek 0.16.1", "vek 0.17.0",
"veloren-client", "veloren-client",
"veloren-client-i18n", "veloren-client-i18n",
"veloren-common", "veloren-common",
@ -7324,7 +7303,7 @@ version = "0.10.0"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"lazy_static", "lazy_static",
"vek 0.16.1", "vek 0.17.0",
"veloren-common", "veloren-common",
"veloren-common-dynlib", "veloren-common-dynlib",
] ]
@ -7380,7 +7359,6 @@ dependencies = [
"num 0.4.1", "num 0.4.1",
"num-traits", "num-traits",
"ordered-float 3.9.2", "ordered-float 3.9.2",
"packed_simd",
"rand 0.8.5", "rand 0.8.5",
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"rayon", "rayon",
@ -7393,7 +7371,7 @@ dependencies = [
"svg_fmt", "svg_fmt",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"vek 0.16.1", "vek 0.17.0",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-dynlib", "veloren-common-dynlib",

7
Cargo.toml
View File

@ -1,5 +1,3 @@
cargo-features = ["named-profiles", "profile-overrides"]
[workspace] [workspace]
resolver = "2" resolver = "2"
members = [ members = [
@ -147,7 +145,7 @@ crossbeam-channel = { version = "0.5" }
ordered-float = { version = "3", default-features = true } ordered-float = { version = "3", default-features = true }
num = { version = "0.4" } num = { version = "0.4" }
num-traits = { version = "0.2" } num-traits = { version = "0.2" }
vek = { version = "0.16.1", features = ["serde"] } vek = { version = "0.17.0", features = ["serde"] }
itertools = { version = "0.10" } itertools = { version = "0.10" }
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.118", features = ["derive"] }
@ -164,7 +162,8 @@ sha2 = "0.10"
hex = "0.4.3" hex = "0.4.3"
[patch.crates-io] [patch.crates-io]
shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" } # until next specs release
specs = { git = "https://github.com/amethyst/specs.git", rev = "4e2da1df29ee840baa9b936593c45592b7c9ae27" }
# This is needed because of: # This is needed because of:
# * an issue with spirv & naga in wgpu 0.18 (I assume this is fixed upstream but not in 0.18) # * an issue with spirv & naga in wgpu 0.18 (I assume this is fixed upstream but not in 0.18)
# * an issue with uint in uniforms for gl. (potentially fixed in 0.19?) # * an issue with uint in uniforms for gl. (potentially fixed in 0.19?)

1
client/i18n/src/error.rs
View File

@ -45,6 +45,7 @@ pub enum ResourceErr {
#[allow(dead_code)] // false-positive #[allow(dead_code)] // false-positive
err: String, err: String,
}, },
#[allow(dead_code)] // false-positive
BundleError(String), BundleError(String),
} }

1
common/query_server/src/proto.rs
View File

@ -1,3 +1,4 @@
#![allow(non_local_definitions)] //TODO: added 2024-05-15 to update toolchain
use protocol::Protocol; use protocol::Protocol;
pub(crate) const VERSION: u16 = 0; pub(crate) const VERSION: u16 = 0;

3
rtsim/src/lib.rs
View File

@ -7,7 +7,8 @@
binary_heap_drain_sorted, binary_heap_drain_sorted,
fn_traits, fn_traits,
unboxed_closures, unboxed_closures,
tuple_trait tuple_trait,
trait_upcasting
)] )]
pub mod ai; pub mod ai;

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2024-01-17 nightly-2024-05-14

2
server/agent/src/lib.rs
View File

@ -1,4 +1,4 @@
#![feature(exclusive_range_pattern, let_chains)] #![feature(let_chains)]
#![allow( #![allow(
clippy::needless_pass_by_ref_mut //until we find a better way for specs clippy::needless_pass_by_ref_mut //until we find a better way for specs
)] )]

3
server/src/persistence/models.rs
View File

@ -1,5 +1,6 @@
pub struct Character { pub struct Character {
pub character_id: i64, pub character_id: i64,
#[allow(dead_code)]
pub player_uuid: String, pub player_uuid: String,
pub alias: String, pub alias: String,
pub waypoint: Option<String>, pub waypoint: Option<String>,
@ -16,6 +17,7 @@ pub struct Item {
} }
pub struct Body { pub struct Body {
#[allow(dead_code)]
pub body_id: i64, pub body_id: i64,
pub variant: String, pub variant: String,
pub body_data: String, pub body_data: String,
@ -38,6 +40,7 @@ pub struct Pet {
} }
pub struct AbilitySets { pub struct AbilitySets {
#[allow(dead_code)]
pub entity_id: i64, pub entity_id: i64,
pub ability_sets: String, pub ability_sets: String,
} }

1
voxygen/src/credits.rs
View File

@ -7,6 +7,7 @@ use std::path::PathBuf;
// See best practices for attribution: https://wiki.creativecommons.org/wiki/Best_practices_for_attribution // See best practices for attribution: https://wiki.creativecommons.org/wiki/Best_practices_for_attribution
#[allow(dead_code)]
#[derive(Clone, Deserialize)] #[derive(Clone, Deserialize)]
pub struct Art { pub struct Art {
/// Name of the art. /// Name of the art.

1
voxygen/src/hud/mod.rs
View File

@ -1,3 +1,4 @@
#![allow(non_local_definitions)] // because of WidgetCommon derive
mod animation; mod animation;
mod bag; mod bag;
mod buffs; mod buffs;

4
voxygen/src/render/renderer/rain_occlusion_map.rs
View File

@ -11,7 +11,6 @@ pub struct RainOcclusionMapRenderer {
pub terrain_pipeline: rain_occlusion::RainOcclusionPipeline, pub terrain_pipeline: rain_occlusion::RainOcclusionPipeline,
pub figure_pipeline: rain_occlusion::RainOcclusionFigurePipeline, pub figure_pipeline: rain_occlusion::RainOcclusionFigurePipeline,
pub layout: rain_occlusion::RainOcclusionLayout,
} }
pub enum RainOcclusionMap { pub enum RainOcclusionMap {
@ -31,13 +30,10 @@ impl RainOcclusionMap {
if let (Some(terrain_pipeline), Some(figure_pipeline), Some(depth)) = if let (Some(terrain_pipeline), Some(figure_pipeline), Some(depth)) =
(directed, figure, view) (directed, figure, view)
{ {
let layout = rain_occlusion::RainOcclusionLayout::new(device);
Self::Enabled(RainOcclusionMapRenderer { Self::Enabled(RainOcclusionMapRenderer {
depth, depth,
terrain_pipeline, terrain_pipeline,
figure_pipeline, figure_pipeline,
layout,
}) })
} else { } else {
Self::Disabled(Self::create_dummy_tex(device, queue)) Self::Disabled(Self::create_dummy_tex(device, queue))

5
voxygen/src/render/renderer/shadow_map.rs
View File

@ -12,7 +12,6 @@ pub struct ShadowMapRenderer {
pub terrain_directed_pipeline: shadow::ShadowPipeline, pub terrain_directed_pipeline: shadow::ShadowPipeline,
pub figure_directed_pipeline: shadow::ShadowFigurePipeline, pub figure_directed_pipeline: shadow::ShadowFigurePipeline,
pub debug_directed_pipeline: shadow::ShadowDebugPipeline, pub debug_directed_pipeline: shadow::ShadowDebugPipeline,
pub layout: shadow::ShadowLayout,
} }
pub enum ShadowMap { pub enum ShadowMap {
@ -43,8 +42,6 @@ impl ShadowMap {
{ {
let (point_depth, directed_depth) = shadow_views; let (point_depth, directed_depth) = shadow_views;
let layout = shadow::ShadowLayout::new(device);
Self::Enabled(ShadowMapRenderer { Self::Enabled(ShadowMapRenderer {
directed_depth, directed_depth,
point_depth, point_depth,
@ -53,8 +50,6 @@ impl ShadowMap {
terrain_directed_pipeline, terrain_directed_pipeline,
figure_directed_pipeline, figure_directed_pipeline,
debug_directed_pipeline, debug_directed_pipeline,
layout,
}) })
} else { } else {
let (dummy_point, dummy_directed) = Self::create_dummy_shadow_tex(device, queue); let (dummy_point, dummy_directed) = Self::create_dummy_shadow_tex(device, queue);

16
voxygen/src/scene/terrain.rs
View File

@ -153,22 +153,6 @@ struct MeshWorkerResponse {
blocks_of_interest: BlocksOfInterest, blocks_of_interest: BlocksOfInterest,
} }
/// Conversion of SpriteSpec from a hashmap failed because some sprites were
/// missing.
struct SpritesMissing(Vec<SpriteKind>);
use core::fmt;
impl fmt::Display for SpritesMissing {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
writeln!(
f,
"Missing entries in the sprite manifest for these sprites: {:?}",
&self.0,
)
}
}
pub fn get_sprite_instances<'a, I: 'a>( pub fn get_sprite_instances<'a, I: 'a>(
lod_levels: &'a mut [I; SPRITE_LOD_LEVELS], lod_levels: &'a mut [I; SPRITE_LOD_LEVELS],
set_instance: impl Fn(&mut I, SpriteInstance, Vec3<i32>), set_instance: impl Fn(&mut I, SpriteInstance, Vec3<i32>),

1
voxygen/src/ui/widgets/mod.rs
View File

@ -1,3 +1,4 @@
#![allow(non_local_definitions)] // because of WidgetCommon derive
pub mod ghost_image; pub mod ghost_image;
pub mod image_frame; pub mod image_frame;
pub mod image_slider; pub mod image_slider;

5
world/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
[features] [features]
use-dyn-lib = ["common-dynlib"] use-dyn-lib = ["common-dynlib"]
be-dyn-lib = [] be-dyn-lib = []
simd = ["vek/platform_intrinsics", "packed_simd"] simd = ["vek/platform_intrinsics"]
bin_compression = [ bin_compression = [
"lz-fear", "lz-fear",
"deflate", "deflate",
@ -20,7 +20,7 @@ bin_compression = [
] ]
cli = ["clap", "signal-hook", "indicatif"] cli = ["clap", "signal-hook", "indicatif"]
default = ["simd"] default = []
[dependencies] [dependencies]
common = { package = "veloren-common", path = "../common" } common = { package = "veloren-common", path = "../common" }
@ -45,7 +45,6 @@ tracing = { workspace = true }
rand = { workspace = true } rand = { workspace = true }
rand_chacha = { workspace = true } rand_chacha = { workspace = true }
arr_macro = "0.2.1" arr_macro = "0.2.1"
packed_simd = { version = "0.3.9", optional = true }
rayon = { workspace = true } rayon = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
ron = { workspace = true } ron = { workspace = true }

12
world/src/site2/gen.rs
View File

@ -1415,18 +1415,6 @@ impl<'a, const N: usize> PrimitiveTransform for [PrimitiveRef<'a>; N] {
} }
} }
pub trait PrimitiveGroupFill<const N: usize> {
fn fill_many(self, fills: [Fill; N]);
}
impl<const N: usize> PrimitiveGroupFill<N> for [PrimitiveRef<'_>; N] {
fn fill_many(self, fills: [Fill; N]) {
for i in 0..N {
self[i].fill(fills[i].clone());
}
}
}
pub trait Structure { pub trait Structure {
#[cfg(feature = "use-dyn-lib")] #[cfg(feature = "use-dyn-lib")]
const UPDATE_FN: &'static [u8]; const UPDATE_FN: &'static [u8];