pyrox.dev / nixpkgs
lol
fork atom

veloren: 0.16.0 -> 0.17.0 (#429008)

authored by Michele Guerini Rocco and committed by GitHub ed33ba16 531ef345

+1763 -383
unified split
+1756 -377
pkgs/by-name/ve/veloren/fix-on-rust-stable.patch
··· 1 - commit 0829b00ec1a14c8248e1aadca22b132a1b21c40f 2 Author: rnhmjoj <rnhmjoj@inventati.org> 3 - Date: Mon Aug 5 00:34:55 2024 +0200 4 5 - update toolchain to `2024-05-14` 6 - 7 - Backport of 6ec900cf to v0.16.0 8 9 - diff --git a/.cargo/config b/.cargo/config.toml 10 - similarity index 100% 11 - rename from .cargo/config 12 - rename to .cargo/config.toml 13 diff --git a/Cargo.lock b/Cargo.lock 14 - index d0f84803..6f90da69 100644 15 --- a/Cargo.lock 16 +++ b/Cargo.lock 17 - @@ -45,17 +45,6 @@ version = "0.4.8" 18 source = "registry+https://github.com/rust-lang/crates.io-index" 19 - checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" 20 21 - -[[package]] 22 - -name = "ahash" 23 - -version = "0.7.8" 24 - -source = "registry+https://github.com/rust-lang/crates.io-index" 25 - -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" 26 - -dependencies = [ 27 - - "getrandom 0.2.12", 28 - - "once_cell", 29 - - "version_check", 30 - -] 31 - - 32 [[package]] 33 - name = "ahash" 34 - version = "0.8.11" 35 - @@ -4538,16 +4527,6 @@ dependencies = [ 36 - "ttf-parser", 37 ] 38 39 - -[[package]] 40 - -name = "packed_simd" 41 - -version = "0.3.9" 42 - -source = "registry+https://github.com/rust-lang/crates.io-index" 43 - -checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d" 44 - -dependencies = [ 45 - - "cfg-if 1.0.0", 46 - - "num-traits", 47 - -] 48 - - 49 [[package]] 50 - name = "parking" 51 - version = "2.2.0" 52 - @@ -5870,8 +5849,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" 53 54 [[package]] 55 - name = "shred" 56 - -version = "0.15.0" 57 - -source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85" 58 - +version = "0.16.1" 59 +source = "registry+https://github.com/rust-lang/crates.io-index" 60 - +checksum = "656294f5bdcf6d33f0cf89e88a72b58595e3fca0e77e4a4b9e9026179757fb1e" 61 dependencies = [ 62 "ahash 0.8.11", 63 - "arrayvec", 64 - @@ -5884,8 +5864,9 @@ dependencies = [ 65 66 [[package]] 67 - name = "shred-derive" 68 - -version = "0.6.3" 69 - -source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85" 70 - +version = "0.7.0" 71 +source = "registry+https://github.com/rust-lang/crates.io-index" 72 - +checksum = "69760b786f8b40361c10663eb63c81fa7d828008527d26aa7595b99c53ab3a8d" 73 dependencies = [ 74 - "proc-macro2 1.0.79", 75 - "quote 1.0.35", 76 - @@ -6019,10 +6000,9 @@ dependencies = [ 77 [[package]] 78 - name = "specs" 79 - version = "0.20.0" 80 -source = "registry+https://github.com/rust-lang/crates.io-index" 81 - -checksum = "a60eabdfd5a80e458c3e7bcc9f1076d6ce3cc8ddb71d69691f00fc0de735a635" 82 - +source = "git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27#4e2da1df29ee840baa9b936593c45592b7c9ae27" 83 dependencies = [ 84 - - "ahash 0.7.8", 85 - + "ahash 0.8.11", 86 - "crossbeam-queue", 87 - "hibitset", 88 - "log", 89 - @@ -6904,9 +6884,9 @@ dependencies = [ 90 91 [[package]] 92 - name = "vek" 93 - -version = "0.16.1" 94 - +version = "0.17.0" 95 source = "registry+https://github.com/rust-lang/crates.io-index" 96 - -checksum = "c85158043f3bc1fac596d59a77e07948da340b9951b451ed4cb4a8c480aa2157" 97 - +checksum = "cb40015035f83ba23d647e647f8be060d0f6f99b7c7687989fbca3e3d65e7234" 98 dependencies = [ 99 - "approx 0.5.1", 100 - "num-integer", 101 - @@ -6936,7 +6916,7 @@ dependencies = [ 102 - "specs", 103 - "tokio", 104 - "tracing", 105 - - "vek 0.16.1", 106 - + "vek 0.17.0", 107 - "veloren-client-i18n", 108 - "veloren-common", 109 - "veloren-common-base", 110 - @@ -7007,7 +6987,7 @@ dependencies = [ 111 - "tracing", 112 - "tracing-subscriber", 113 - "uuid", 114 - - "vek 0.16.1", 115 - + "vek 0.17.0", 116 - "veloren-common-assets", 117 - "veloren-common-base", 118 - "veloren-common-i18n", 119 - @@ -7092,7 +7072,7 @@ dependencies = [ 120 - "specs", 121 - "sum_type", 122 - "tracing", 123 - - "vek 0.16.1", 124 - + "vek 0.17.0", 125 - "veloren-common", 126 ] 127 128 - @@ -7116,7 +7096,7 @@ dependencies = [ 129 - "timer-queue", 130 - "toml 0.8.12", 131 - "tracing", 132 - - "vek 0.16.1", 133 - + "vek 0.17.0", 134 - "veloren-common", 135 - "veloren-common-assets", 136 - "veloren-common-base", 137 - @@ -7136,7 +7116,7 @@ dependencies = [ 138 - "rayon", 139 - "specs", 140 - "tracing", 141 - - "vek 0.16.1", 142 - + "vek 0.17.0", 143 - "veloren-common", 144 - "veloren-common-base", 145 - "veloren-common-ecs", 146 - @@ -7208,7 +7188,7 @@ dependencies = [ 147 "serde", 148 - "slotmap", 149 - "tracing", 150 - - "vek 0.16.1", 151 - + "vek 0.17.0", 152 - "veloren-common", 153 - "veloren-world", 154 ] 155 - @@ -7251,7 +7231,7 @@ dependencies = [ 156 - "strum 0.24.1", 157 - "tokio", 158 "tracing", 159 - - "vek 0.16.1", 160 - + "vek 0.17.0", 161 - "veloren-common", 162 - "veloren-common-base", 163 - "veloren-common-ecs", 164 - @@ -7272,7 +7252,7 @@ dependencies = [ 165 "lazy_static", 166 - "rand 0.8.5", 167 - "specs", 168 - - "vek 0.16.1", 169 - + "vek 0.17.0", 170 - "veloren-common", 171 - "veloren-common-dynlib", 172 - "veloren-rtsim", 173 - @@ -7368,7 +7348,7 @@ dependencies = [ 174 - "tokio", 175 - "tracing", 176 - "treeculler", 177 - - "vek 0.16.1", 178 - + "vek 0.17.0", 179 - "veloren-client", 180 - "veloren-client-i18n", 181 - "veloren-common", 182 - @@ -7396,7 +7376,7 @@ version = "0.10.0" 183 dependencies = [ 184 - "bytemuck", 185 "lazy_static", 186 - - "vek 0.16.1", 187 - + "vek 0.17.0", 188 - "veloren-common", 189 - "veloren-common-dynlib", 190 ] 191 - @@ -7452,7 +7432,6 @@ dependencies = [ 192 - "num 0.4.1", 193 "num-traits", 194 - "ordered-float 3.9.2", 195 - - "packed_simd", 196 - "rand 0.8.5", 197 - "rand_chacha 0.3.1", 198 "rayon", 199 - @@ -7465,7 +7444,7 @@ dependencies = [ 200 - "svg_fmt", 201 "tracing", 202 - "tracing-subscriber", 203 - - "vek 0.16.1", 204 - + "vek 0.17.0", 205 - "veloren-common", 206 - "veloren-common-base", 207 - "veloren-common-dynlib", 208 - diff --git a/Cargo.toml b/Cargo.toml 209 - index c8d02902..02521745 100644 210 - --- a/Cargo.toml 211 - +++ b/Cargo.toml 212 - @@ -1,5 +1,3 @@ 213 - -cargo-features = ["named-profiles", "profile-overrides"] 214 - - 215 - [workspace] 216 - resolver = "2" 217 - members = [ 218 - @@ -141,7 +139,7 @@ crossbeam-channel = { version = "0.5"} 219 - ordered-float = { version = "3", default-features = true } 220 - num = { version = "0.4" } 221 - num-traits = { version = "0.2" } 222 - -vek = { version = "0.16.1", features = ["serde"] } 223 - +vek = { version = "0.17.0", features = ["serde"] } 224 - itertools = { version = "0.10" } 225 226 - serde = { version = "1.0.118", features = ["derive"] } 227 - @@ -158,7 +156,7 @@ sha2 = "0.10" 228 - hex = "0.4.3" 229 230 - [patch.crates-io] 231 - -shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" } 232 - +specs = { git = "https://github.com/amethyst/specs.git", rev = "4e2da1df29ee840baa9b936593c45592b7c9ae27" } 233 - # This is needed because of: 234 - # * an issue with spirv & naga in wgpu 0.18 (I assume this is fixed upstream but not in 0.18) 235 - # * an issue with uint in uniforms for gl. (potentially fixed in 0.19?) 236 - diff --git a/client/i18n/src/error.rs b/client/i18n/src/error.rs 237 - index 99f47bad..37eaa097 100644 238 - --- a/client/i18n/src/error.rs 239 - +++ b/client/i18n/src/error.rs 240 - @@ -45,6 +45,7 @@ pub enum ResourceErr { 241 - #[allow(dead_code)] // false-positive 242 - err: String, 243 - }, 244 - + #[allow(dead_code)] // false-positive 245 - BundleError(String), 246 - } 247 248 - diff --git a/rtsim/src/lib.rs b/rtsim/src/lib.rs 249 - index 11477390..ef62db65 100644 250 - --- a/rtsim/src/lib.rs 251 - +++ b/rtsim/src/lib.rs 252 - @@ -7,7 +7,8 @@ 253 - binary_heap_drain_sorted, 254 - fn_traits, 255 - unboxed_closures, 256 - - tuple_trait 257 - + tuple_trait, 258 - + trait_upcasting 259 - )] 260 261 - pub mod ai; 262 - diff --git a/rust-toolchain b/rust-toolchain 263 - index f1273305..e426a2f8 100644 264 - --- a/rust-toolchain 265 - +++ b/rust-toolchain 266 - @@ -1 +1 @@ 267 - -nightly-2024-01-17 268 - +nightly-2024-05-14 269 - diff --git a/server/agent/src/lib.rs b/server/agent/src/lib.rs 270 - index 420bd5ff..4a927c74 100644 271 - --- a/server/agent/src/lib.rs 272 - +++ b/server/agent/src/lib.rs 273 - @@ -1,4 +1,4 @@ 274 - -#![feature(exclusive_range_pattern, let_chains)] 275 - +#![feature(let_chains)] 276 - #![allow( 277 - clippy::needless_pass_by_ref_mut //until we find a better way for specs 278 - )] 279 - diff --git a/server/src/persistence/models.rs b/server/src/persistence/models.rs 280 - index df148742..70baed42 100644 281 - --- a/server/src/persistence/models.rs 282 - +++ b/server/src/persistence/models.rs 283 - @@ -1,5 +1,6 @@ 284 - pub struct Character { 285 - pub character_id: i64, 286 - + #[allow(dead_code)] 287 - pub player_uuid: String, 288 - pub alias: String, 289 - pub waypoint: Option<String>, 290 - @@ -16,6 +17,7 @@ pub struct Item { 291 } 292 293 - pub struct Body { 294 - + #[allow(dead_code)] 295 - pub body_id: i64, 296 - pub variant: String, 297 - pub body_data: String, 298 - @@ -38,6 +40,7 @@ pub struct Pet { 299 } 300 301 - pub struct AbilitySets { 302 - + #[allow(dead_code)] 303 - pub entity_id: i64, 304 - pub ability_sets: String, 305 } 306 - diff --git a/voxygen/src/credits.rs b/voxygen/src/credits.rs 307 - index 2de54687..be49ac97 100644 308 - --- a/voxygen/src/credits.rs 309 - +++ b/voxygen/src/credits.rs 310 - @@ -7,6 +7,7 @@ use std::path::PathBuf; 311 312 - // See best practices for attribution: https://wiki.creativecommons.org/wiki/Best_practices_for_attribution 313 314 - +#[allow(dead_code)] 315 - #[derive(Clone, Deserialize)] 316 - pub struct Art { 317 - /// Name of the art. 318 - diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs 319 - index e62250ca..6be79389 100755 320 - --- a/voxygen/src/hud/mod.rs 321 - +++ b/voxygen/src/hud/mod.rs 322 - @@ -1,3 +1,4 @@ 323 - +#![allow(non_local_definitions)] // because of WidgetCommon derive 324 - mod animation; 325 - mod bag; 326 - mod buffs; 327 - diff --git a/voxygen/src/render/renderer/rain_occlusion_map.rs b/voxygen/src/render/renderer/rain_occlusion_map.rs 328 - index bdc44f98..68026806 100644 329 - --- a/voxygen/src/render/renderer/rain_occlusion_map.rs 330 - +++ b/voxygen/src/render/renderer/rain_occlusion_map.rs 331 - @@ -11,7 +11,6 @@ pub struct RainOcclusionMapRenderer { 332 333 - pub terrain_pipeline: rain_occlusion::RainOcclusionPipeline, 334 - pub figure_pipeline: rain_occlusion::RainOcclusionFigurePipeline, 335 - - pub layout: rain_occlusion::RainOcclusionLayout, 336 } 337 338 - pub enum RainOcclusionMap { 339 - @@ -31,13 +30,10 @@ impl RainOcclusionMap { 340 - if let (Some(terrain_pipeline), Some(figure_pipeline), Some(depth)) = 341 - (directed, figure, view) 342 - { 343 - - let layout = rain_occlusion::RainOcclusionLayout::new(device); 344 - - 345 - Self::Enabled(RainOcclusionMapRenderer { 346 - depth, 347 - terrain_pipeline, 348 - figure_pipeline, 349 - - layout, 350 - }) 351 - } else { 352 - Self::Disabled(Self::create_dummy_tex(device, queue)) 353 - diff --git a/voxygen/src/render/renderer/shadow_map.rs b/voxygen/src/render/renderer/shadow_map.rs 354 - index 7b5ab16e..b15a2da3 100644 355 - --- a/voxygen/src/render/renderer/shadow_map.rs 356 - +++ b/voxygen/src/render/renderer/shadow_map.rs 357 - @@ -12,7 +12,6 @@ pub struct ShadowMapRenderer { 358 - pub terrain_directed_pipeline: shadow::ShadowPipeline, 359 - pub figure_directed_pipeline: shadow::ShadowFigurePipeline, 360 - pub debug_directed_pipeline: shadow::ShadowDebugPipeline, 361 - - pub layout: shadow::ShadowLayout, 362 } 363 364 - pub enum ShadowMap { 365 - @@ -43,8 +42,6 @@ impl ShadowMap { 366 - { 367 - let (point_depth, directed_depth) = shadow_views; 368 369 - - let layout = shadow::ShadowLayout::new(device); 370 - - 371 - Self::Enabled(ShadowMapRenderer { 372 - directed_depth, 373 - point_depth, 374 - @@ -53,8 +50,6 @@ impl ShadowMap { 375 - terrain_directed_pipeline, 376 - figure_directed_pipeline, 377 - debug_directed_pipeline, 378 - - 379 - - layout, 380 - }) 381 } else { 382 - let (dummy_point, dummy_directed) = Self::create_dummy_shadow_tex(device, queue); 383 - diff --git a/voxygen/src/ui/widgets/mod.rs b/voxygen/src/ui/widgets/mod.rs 384 - index e7ce5ee8..622e7e9e 100644 385 - --- a/voxygen/src/ui/widgets/mod.rs 386 - +++ b/voxygen/src/ui/widgets/mod.rs 387 - @@ -1,3 +1,4 @@ 388 - +#![allow(non_local_definitions)] // because of WidgetCommon derive 389 - pub mod ghost_image; 390 - pub mod image_frame; 391 - pub mod image_slider; 392 - diff --git a/world/Cargo.toml b/world/Cargo.toml 393 - index 92bd288f..6ff2e79e 100644 394 - --- a/world/Cargo.toml 395 - +++ b/world/Cargo.toml 396 - @@ -7,11 +7,11 @@ edition = "2021" 397 - [features] 398 - use-dyn-lib = ["common-dynlib"] 399 - be-dyn-lib = [] 400 - -simd = ["vek/platform_intrinsics", "packed_simd"] 401 - +simd = ["vek/platform_intrinsics"] 402 - bin_compression = ["lz-fear", "deflate", "flate2", "image/jpeg", "num-traits", "fallible-iterator", "rstar", "cli"] 403 - cli = ["clap", "signal-hook", "indicatif"] 404 405 - -default = ["simd"] 406 - +default = [] 407 408 - [dependencies] 409 - common = { package = "veloren-common", path = "../common" } 410 - @@ -36,7 +36,6 @@ tracing = { workspace = true } 411 - rand = { workspace = true } 412 - rand_chacha = { workspace = true } 413 - arr_macro = "0.2.1" 414 - -packed_simd = { version = "0.3.9", optional = true } 415 - rayon = { workspace = true } 416 - serde = { workspace = true } 417 - ron = { workspace = true } 418 - diff --git a/world/src/site2/gen.rs b/world/src/site2/gen.rs 419 - index 59c57766..0800ccee 100644 420 - --- a/world/src/site2/gen.rs 421 - +++ b/world/src/site2/gen.rs 422 - @@ -1415,18 +1415,6 @@ impl<'a, const N: usize> PrimitiveTransform for [PrimitiveRef<'a>; N] { 423 } 424 } 425 426 - -pub trait PrimitiveGroupFill<const N: usize> { 427 - - fn fill_many(self, fills: [Fill; N]); 428 - -} 429 - - 430 - -impl<const N: usize> PrimitiveGroupFill<N> for [PrimitiveRef<'_>; N] { 431 - - fn fill_many(self, fills: [Fill; N]) { 432 - - for i in 0..N { 433 - - self[i].fill(fills[i].clone()); 434 - - } 435 - - } 436 - -} 437 - - 438 - pub trait Structure { 439 - #[cfg(feature = "use-dyn-lib")] 440 - const UPDATE_FN: &'static [u8];
··· 1 + commit eca36e8293bef85493657f514cf37119bb27e2e0 2 + Author: rnhmjoj <rnhmjoj@inventati.org> 3 + Date: Wed Jul 30 16:34:18 2025 +0200 4 + 5 + Update toolchain 6 + 7 + diff --git a/common/net/src/lib.rs b/common/net/src/lib.rs 8 + index 671aa074d..78cfdcb96 100644 9 + --- a/common/net/src/lib.rs 10 + +++ b/common/net/src/lib.rs 11 + @@ -1,5 +1,5 @@ 12 + #![allow(incomplete_features)] 13 + -#![feature(generic_const_exprs, const_fn_floating_point_arithmetic)] 14 + +#![feature(generic_const_exprs)] 15 + pub mod msg; 16 + pub mod sync; 17 + pub mod synced_components; 18 + diff --git a/common/systems/src/mount.rs b/common/systems/src/mount.rs 19 + index ed1b7f3c4..9acf953ec 100644 20 + --- a/common/systems/src/mount.rs 21 + +++ b/common/systems/src/mount.rs 22 + @@ -67,7 +67,7 @@ impl<'a> System<'a> for Sys { 23 + if !matches!(body, Some(Body::Humanoid(_))) { 24 + let actions = c 25 + .actions 26 + - .extract_if(|action| match action { 27 + + .extract_if(.., |action| match action { 28 + ControlAction::StartInput { input: i, .. } 29 + | ControlAction::CancelInput(i) => matches!( 30 + i, 31 + @@ -164,7 +164,7 @@ impl<'a> System<'a> for Sys { 32 + let inputs = controllers.get_mut(entity).map(|c| { 33 + let actions: Vec<_> = c 34 + .actions 35 + - .extract_if(|action| match action { 36 + + .extract_if(.., |action| match action { 37 + ControlAction::StartInput { input: i, .. } 38 + | ControlAction::CancelInput(i) => { 39 + matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll) 40 + diff --git a/network/examples/fileshare/main.rs b/network/examples/fileshare/main.rs 41 + index 015e46e9e..fc8db3a0d 100644 42 + --- a/network/examples/fileshare/main.rs 43 + +++ b/network/examples/fileshare/main.rs 44 + @@ -1,4 +1,3 @@ 45 + -#![feature(async_closure)] 46 + //!run with 47 + //! (cd network/examples/fileshare && RUST_BACKTRACE=1 cargo run 48 + //! --profile=release -Z unstable-options -- --trace=info --port 15006) 49 + diff --git a/rtsim/src/lib.rs b/rtsim/src/lib.rs 50 + index ef62db65e..000831da3 100644 51 + --- a/rtsim/src/lib.rs 52 + +++ b/rtsim/src/lib.rs 53 + @@ -2,7 +2,6 @@ 54 + never_type, 55 + try_blocks, 56 + trait_alias, 57 + - control_flow_enum, 58 + let_chains, 59 + binary_heap_drain_sorted, 60 + fn_traits, 61 + diff --git a/voxygen/benches/meshing_benchmark.rs b/voxygen/benches/meshing_benchmark.rs 62 + index 2cfe9563a..929d62b17 100644 63 + --- a/voxygen/benches/meshing_benchmark.rs 64 + +++ b/voxygen/benches/meshing_benchmark.rs 65 + @@ -146,7 +146,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { 66 + for x in 1..GEN_SIZE - 1 { 67 + for y in 1..GEN_SIZE - 1 { 68 + let (volume, range) = sample(Vec2::new(x, y)); 69 + - meshing_benches.bench_function(&format!("Terrain mesh {}, {}", x, y), move |b| { 70 + + meshing_benches.bench_function(format!("Terrain mesh {}, {}", x, y), move |b| { 71 + b.iter(|| { 72 + generate_mesh( 73 + black_box(&volume), 74 + diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs 75 + index 70ca5dd10..143791d2f 100644 76 + --- a/voxygen/src/lib.rs 77 + +++ b/voxygen/src/lib.rs 78 + @@ -9,7 +9,6 @@ 79 + #![feature( 80 + extract_if, 81 + trait_alias, 82 + - option_get_or_insert_default, 83 + map_try_insert, 84 + slice_as_chunks, 85 + let_chains, 86 + diff --git a/voxygen/src/panic_handler.rs b/voxygen/src/panic_handler.rs 87 + index a2c0ee381..9cecff787 100644 88 + --- a/voxygen/src/panic_handler.rs 89 + +++ b/voxygen/src/panic_handler.rs 90 + @@ -1,4 +1,4 @@ 91 + -use std::{panic, panic::PanicInfo, path::PathBuf}; 92 + +use std::{panic, panic::PanicHookInfo, path::PathBuf}; 93 + use tracing::error; 94 + 95 + pub fn set_panic_hook(log_filename: String, logs_dir: PathBuf) { 96 + @@ -113,7 +113,7 @@ enum PotentialPanicCause { 97 + GraphicsCardIncompatibleWithRenderingBackend, 98 + } 99 + 100 + -fn potential_cause(panic_info: &PanicInfo) -> Option<String> { 101 + +fn potential_cause(panic_info: &PanicHookInfo) -> Option<String> { 102 + let location = panic_info 103 + .location() 104 + .map_or("".to_string(), |x| x.file().to_string()) 105 + diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs 106 + index d5251b53a..e654a288b 100644 107 + --- a/voxygen/src/scene/figure/cache.rs 108 + +++ b/voxygen/src/scene/figure/cache.rs 109 + @@ -406,7 +406,8 @@ where 110 + item_key: Option<ItemKey>, 111 + ) -> (FigureModelEntryLod<'c>, &'c Skel::Attr) 112 + where 113 + - for<'a> &'a Skel::Body: Into<Skel::Attr>, 114 + + Skel::Attr: 'c, 115 + + Skel::Attr: for<'a> From<&'a Skel::Body>, 116 + Skel::Body: Clone + Send + Sync + 'static, 117 + <Skel::Body as BodySpec>::Spec: Send + Sync + 'static, 118 + { 119 + @@ -443,7 +444,7 @@ where 120 + opaque, 121 + bounds, 122 + vertex_range, 123 + - }) = Arc::get_mut(recv).take().and_then(|cell| cell.take()) 124 + + }) = Arc::get_mut(recv).and_then(|cell| cell.take()) 125 + { 126 + let model_entry = atlas.create_figure( 127 + renderer, 128 + @@ -641,6 +642,7 @@ where 129 + sprite_render_state: &Arc<SpriteRenderState>, 130 + ) -> (TerrainModelEntryLod<'c>, &'c Skel::Attr) 131 + where 132 + + Skel::Attr: 'c, 133 + for<'a> &'a Skel::Body: Into<Skel::Attr>, 134 + Skel::Body: Clone + Send + Sync + 'static, 135 + <Skel::Body as BodySpec>::Spec: Send + Sync + 'static, 136 + @@ -669,7 +671,7 @@ where 137 + sprite_instances, 138 + blocks_of_interest, 139 + blocks_offset, 140 + - }) = Arc::get_mut(recv).take().and_then(|cell| cell.take()) 141 + + }) = Arc::get_mut(recv).and_then(|cell| cell.take()) 142 + { 143 + let model_entry = atlas.create_terrain( 144 + renderer, 145 + 146 + commit 97378a437847b8860e548de3ce70c2c53f9347f6 147 Author: rnhmjoj <rnhmjoj@inventati.org> 148 + Date: Wed Jul 30 00:23:35 2025 +0200 149 150 + Fix wasmtime-wasi build 151 152 diff --git a/Cargo.lock b/Cargo.lock 153 + index f751793bc..593f05ec1 100644 154 --- a/Cargo.lock 155 +++ b/Cargo.lock 156 + @@ -1,6 +1,6 @@ 157 + # This file is automatically @generated by Cargo. 158 + # It is not intended for manual editing. 159 + -version = 3 160 + +version = 4 161 + 162 + [[package]] 163 + name = "ab_glyph" 164 + @@ -197,9 +197,9 @@ dependencies = [ 165 + 166 + [[package]] 167 + name = "anyhow" 168 + -version = "1.0.89" 169 + +version = "1.0.98" 170 + source = "registry+https://github.com/rust-lang/crates.io-index" 171 + -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" 172 + +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" 173 + 174 + [[package]] 175 + name = "anymap2" 176 + @@ -248,9 +248,9 @@ dependencies = [ 177 + 178 + [[package]] 179 + name = "arbitrary" 180 + -version = "1.3.2" 181 + +version = "1.4.1" 182 + source = "registry+https://github.com/rust-lang/crates.io-index" 183 + -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" 184 + +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" 185 + 186 + [[package]] 187 + name = "arr_macro" 188 + @@ -350,7 +350,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" 189 + dependencies = [ 190 + "proc-macro2 1.0.89", 191 + "quote 1.0.37", 192 + - "syn 2.0.79", 193 + + "syn 2.0.87", 194 + ] 195 + 196 + [[package]] 197 + @@ -518,7 +518,7 @@ dependencies = [ 198 + "regex", 199 + "rustc-hash 1.1.0", 200 + "shlex", 201 + - "syn 2.0.79", 202 + + "syn 2.0.87", 203 + ] 204 + 205 + [[package]] 206 + @@ -622,6 +622,9 @@ name = "bumpalo" 207 + version = "3.16.0" 208 source = "registry+https://github.com/rust-lang/crates.io-index" 209 + checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" 210 + +dependencies = [ 211 + + "allocator-api2", 212 + +] 213 214 [[package]] 215 + name = "bytemuck" 216 + @@ -640,7 +643,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" 217 + dependencies = [ 218 + "proc-macro2 1.0.89", 219 + "quote 1.0.37", 220 + - "syn 2.0.79", 221 + + "syn 2.0.87", 222 ] 223 224 + [[package]] 225 + @@ -980,7 +983,7 @@ dependencies = [ 226 + "heck 0.5.0", 227 + "proc-macro2 1.0.89", 228 + "quote 1.0.37", 229 + - "syn 2.0.79", 230 + + "syn 2.0.87", 231 + ] 232 + 233 [[package]] 234 + @@ -1337,19 +1340,34 @@ dependencies = [ 235 + ] 236 237 [[package]] 238 + -name = "cranelift-bforest" 239 + -version = "0.113.1" 240 + +name = "cranelift-assembler-x64" 241 + +version = "0.117.2" 242 + source = "registry+https://github.com/rust-lang/crates.io-index" 243 + -checksum = "540b193ff98b825a1f250a75b3118911af918a734154c69d80bcfcf91e7e9522" 244 + +checksum = "d2b83fcf2fc1c8954561490d02079b496fd0c757da88129981e15bfe3a548229" 245 + +dependencies = [ 246 + + "cranelift-assembler-x64-meta", 247 + +] 248 + + 249 + +[[package]] 250 + +name = "cranelift-assembler-x64-meta" 251 + +version = "0.117.2" 252 +source = "registry+https://github.com/rust-lang/crates.io-index" 253 + +checksum = "c7496a6e92b5cee48c5d772b0443df58816dee30fed6ba19b2a28e78037ecedf" 254 + + 255 + +[[package]] 256 + +name = "cranelift-bforest" 257 + +version = "0.117.2" 258 + +source = "registry+https://github.com/rust-lang/crates.io-index" 259 + +checksum = "73a9dc0a8d3d49ee772101924968830f1c1937d650c571d3c2dd69dc36a68f41" 260 + dependencies = [ 261 + "cranelift-entity", 262 + ] 263 + 264 + [[package]] 265 + name = "cranelift-bitset" 266 + -version = "0.113.1" 267 + +version = "0.117.2" 268 + source = "registry+https://github.com/rust-lang/crates.io-index" 269 + -checksum = "c7cb269598b9557ab942d687d3c1086d77c4b50dcf35813f3a65ba306fd42279" 270 + +checksum = "573c641174c40ef31021ae4a5a3ad78974e280633502d0dfc6e362385e0c100f" 271 + dependencies = [ 272 + "serde", 273 + "serde_derive", 274 + @@ -1357,11 +1375,12 @@ dependencies = [ 275 + 276 + [[package]] 277 + name = "cranelift-codegen" 278 + -version = "0.113.1" 279 + +version = "0.117.2" 280 + source = "registry+https://github.com/rust-lang/crates.io-index" 281 + -checksum = "46566d7c83a8bff4150748d66020f4c7224091952aa4b4df1ec4959c39d937a1" 282 + +checksum = "2d7c94d572615156f2db682181cadbd96342892c31e08cc26a757344319a9220" 283 + dependencies = [ 284 + "bumpalo", 285 + + "cranelift-assembler-x64", 286 + "cranelift-bforest", 287 + "cranelift-bitset", 288 + "cranelift-codegen-meta", 289 + @@ -1370,43 +1389,47 @@ dependencies = [ 290 + "cranelift-entity", 291 + "cranelift-isle", 292 + "gimli", 293 + - "hashbrown 0.14.5", 294 + + "hashbrown 0.15.4", 295 + "log", 296 + + "pulley-interpreter", 297 + "regalloc2", 298 + "rustc-hash 2.0.0", 299 + + "serde", 300 + "smallvec", 301 + "target-lexicon", 302 + ] 303 + 304 + [[package]] 305 + name = "cranelift-codegen-meta" 306 + -version = "0.113.1" 307 + +version = "0.117.2" 308 + source = "registry+https://github.com/rust-lang/crates.io-index" 309 + -checksum = "2df8a86a34236cc75a8a6a271973da779c2aeb36c43b6e14da474cf931317082" 310 + +checksum = "beecd9fcf2c3e06da436d565de61a42676097ea6eb6b4499346ac6264b6bb9ce" 311 + dependencies = [ 312 + + "cranelift-assembler-x64", 313 + "cranelift-codegen-shared", 314 + + "pulley-interpreter", 315 + ] 316 + 317 + [[package]] 318 + name = "cranelift-codegen-shared" 319 + -version = "0.113.1" 320 + +version = "0.117.2" 321 + source = "registry+https://github.com/rust-lang/crates.io-index" 322 + -checksum = "cf75340b6a57b7c7c1b74f10d3d90883ee6d43a554be8131a4046c2ebcf5eb65" 323 + +checksum = "0f4ff8d2e1235f2d6e7fc3c6738be6954ba972cd295f09079ebffeca2f864e22" 324 + 325 + [[package]] 326 + name = "cranelift-control" 327 + -version = "0.113.1" 328 + +version = "0.117.2" 329 + source = "registry+https://github.com/rust-lang/crates.io-index" 330 + -checksum = "2e84495bc5d23d86aad8c86f8ade4af765b94882af60d60e271d3153942f1978" 331 + +checksum = "001312e9fbc7d9ca9517474d6fe71e29d07e52997fd7efe18f19e8836446ceb2" 332 + dependencies = [ 333 + "arbitrary", 334 + ] 335 + 336 + [[package]] 337 + name = "cranelift-entity" 338 + -version = "0.113.1" 339 + +version = "0.117.2" 340 + source = "registry+https://github.com/rust-lang/crates.io-index" 341 + -checksum = "963c17147b80df351965e57c04d20dbedc85bcaf44c3436780a59a3f1ff1b1c2" 342 + +checksum = "eb0fd6d4aae680275fcbceb08683416b744e65c8b607352043d3f0951d72b3b2" 343 + dependencies = [ 344 + "cranelift-bitset", 345 + "serde", 346 + @@ -1415,9 +1438,9 @@ dependencies = [ 347 + 348 + [[package]] 349 + name = "cranelift-frontend" 350 + -version = "0.113.1" 351 + +version = "0.117.2" 352 + source = "registry+https://github.com/rust-lang/crates.io-index" 353 + -checksum = "727f02acbc4b4cb2ba38a6637101d579db50190df1dd05168c68e762851a3dd5" 354 + +checksum = "9fd44e7e5dcea20ca104d45894748205c51365ce4cdb18f4418e3ba955971d1b" 355 + dependencies = [ 356 + "cranelift-codegen", 357 + "log", 358 + @@ -1427,15 +1450,15 @@ dependencies = [ 359 + 360 + [[package]] 361 + name = "cranelift-isle" 362 + -version = "0.113.1" 363 + +version = "0.117.2" 364 + source = "registry+https://github.com/rust-lang/crates.io-index" 365 + -checksum = "32b00cc2e03c748f2531eea01c871f502b909d30295fdcad43aec7bf5c5b4667" 366 + +checksum = "f900e0a3847d51eed0321f0777947fb852ccfce0da7fb070100357f69a2f37fc" 367 + 368 + [[package]] 369 + name = "cranelift-native" 370 + -version = "0.113.1" 371 + +version = "0.117.2" 372 + source = "registry+https://github.com/rust-lang/crates.io-index" 373 + -checksum = "bbeaf978dc7c1a2de8bbb9162510ed218eb156697bc45590b8fbdd69bb08e8de" 374 + +checksum = "7617f13f392ebb63c5126258aca8b8eca739636ca7e4eeee301d3eff68489a6a" 375 + dependencies = [ 376 + "cranelift-codegen", 377 + "libc", 378 + @@ -1647,7 +1670,7 @@ checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279" 379 + dependencies = [ 380 + "proc-macro2 1.0.89", 381 + "quote 1.0.37", 382 + - "syn 2.0.79", 383 + + "syn 2.0.87", 384 + ] 385 + 386 + [[package]] 387 + @@ -1697,7 +1720,7 @@ dependencies = [ 388 + "proc-macro2 1.0.89", 389 + "quote 1.0.37", 390 + "strsim", 391 + - "syn 2.0.79", 392 + + "syn 2.0.87", 393 + ] 394 + 395 + [[package]] 396 + @@ -1708,7 +1731,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" 397 + dependencies = [ 398 + "darling_core", 399 + "quote 1.0.37", 400 + - "syn 2.0.79", 401 + + "syn 2.0.87", 402 + ] 403 + 404 + [[package]] 405 + @@ -1884,7 +1907,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" 406 + dependencies = [ 407 + "proc-macro2 1.0.89", 408 + "quote 1.0.37", 409 + - "syn 2.0.79", 410 + + "syn 2.0.87", 411 + ] 412 + 413 + [[package]] 414 + @@ -2044,7 +2067,7 @@ dependencies = [ 415 + "heck 0.5.0", 416 + "proc-macro2 1.0.89", 417 + "quote 1.0.37", 418 + - "syn 2.0.79", 419 + + "syn 2.0.87", 420 + ] 421 + 422 + [[package]] 423 + @@ -2065,7 +2088,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" 424 + dependencies = [ 425 + "proc-macro2 1.0.89", 426 + "quote 1.0.37", 427 + - "syn 2.0.79", 428 + + "syn 2.0.87", 429 + ] 430 + 431 + [[package]] 432 + @@ -2086,7 +2109,7 @@ dependencies = [ 433 + "darling", 434 + "proc-macro2 1.0.89", 435 + "quote 1.0.37", 436 + - "syn 2.0.79", 437 + + "syn 2.0.87", 438 + ] 439 + 440 + [[package]] 441 + @@ -2112,12 +2135,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" 442 + 443 + [[package]] 444 + name = "errno" 445 + -version = "0.3.9" 446 + +version = "0.3.13" 447 + source = "registry+https://github.com/rust-lang/crates.io-index" 448 + -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" 449 + +checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" 450 + dependencies = [ 451 + "libc", 452 + - "windows-sys 0.52.0", 453 + + "windows-sys 0.59.0", 454 + ] 455 + 456 + [[package]] 457 + @@ -2377,7 +2400,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" 458 + dependencies = [ 459 + "proc-macro2 1.0.89", 460 + "quote 1.0.37", 461 + - "syn 2.0.79", 462 + + "syn 2.0.87", 463 + ] 464 + 465 + [[package]] 466 + @@ -2484,7 +2507,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" 467 + dependencies = [ 468 + "proc-macro2 1.0.89", 469 + "quote 1.0.37", 470 + - "syn 2.0.79", 471 + + "syn 2.0.87", 472 + ] 473 + 474 + [[package]] 475 + @@ -2651,7 +2674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 476 + checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" 477 + dependencies = [ 478 + "fallible-iterator", 479 + - "indexmap 2.5.0", 480 + + "indexmap 2.10.0", 481 + "stable_deref_trait", 482 + ] 483 + 484 + @@ -2860,16 +2883,14 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" 485 dependencies = [ 486 "ahash 0.8.11", 487 + "allocator-api2", 488 + - "serde", 489 + ] 490 + 491 + [[package]] 492 + name = "hashbrown" 493 + -version = "0.15.1" 494 + +version = "0.15.4" 495 + source = "registry+https://github.com/rust-lang/crates.io-index" 496 + -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" 497 + +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" 498 + dependencies = [ 499 + - "allocator-api2", 500 + "equivalent", 501 + "foldhash", 502 + "rayon", 503 + @@ -3330,7 +3351,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" 504 + dependencies = [ 505 + "proc-macro2 1.0.89", 506 + "quote 1.0.37", 507 + - "syn 2.0.79", 508 + + "syn 2.0.87", 509 + ] 510 + 511 + [[package]] 512 + @@ -3393,12 +3414,12 @@ dependencies = [ 513 + 514 + [[package]] 515 + name = "indexmap" 516 + -version = "2.5.0" 517 + +version = "2.10.0" 518 + source = "registry+https://github.com/rust-lang/crates.io-index" 519 + -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" 520 + +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" 521 + dependencies = [ 522 + "equivalent", 523 + - "hashbrown 0.14.5", 524 + + "hashbrown 0.15.4", 525 + "rayon", 526 + "serde", 527 + ] 528 + @@ -3438,7 +3459,7 @@ dependencies = [ 529 + "lazy_static", 530 + "proc-macro2 1.0.89", 531 + "rustc-hash 1.1.0", 532 + - "syn 2.0.79", 533 + + "syn 2.0.87", 534 + ] 535 + 536 + [[package]] 537 + @@ -3449,7 +3470,7 @@ checksum = "46d62a0a3b6af04d4eee8e7251cd758ce74b0ed86253d3e4ac8a1b297a75f4a0" 538 + dependencies = [ 539 + "proc-macro2 1.0.89", 540 + "quote 1.0.37", 541 + - "syn 2.0.79", 542 + + "syn 2.0.87", 543 + ] 544 + 545 + [[package]] 546 + @@ -3505,7 +3526,7 @@ dependencies = [ 547 + "pretty_assertions", 548 + "proc-macro2 1.0.89", 549 + "quote 1.0.37", 550 + - "syn 2.0.79", 551 + + "syn 2.0.87", 552 + ] 553 + 554 + [[package]] 555 + @@ -3637,9 +3658,9 @@ dependencies = [ 556 + 557 + [[package]] 558 + name = "itoa" 559 + -version = "1.0.11" 560 + +version = "1.0.15" 561 + source = "registry+https://github.com/rust-lang/crates.io-index" 562 + -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" 563 + +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" 564 565 [[package]] 566 + name = "ittapi" 567 + @@ -3821,6 +3842,12 @@ version = "0.2.5" 568 + source = "registry+https://github.com/rust-lang/crates.io-index" 569 + checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" 570 + 571 + +[[package]] 572 + +name = "leb128fmt" 573 + +version = "0.1.0" 574 +source = "registry+https://github.com/rust-lang/crates.io-index" 575 + +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" 576 + + 577 + [[package]] 578 + name = "levenshtein" 579 + version = "1.0.5" 580 + @@ -3850,7 +3877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 581 + checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" 582 + dependencies = [ 583 + "cfg-if 1.0.0", 584 + - "windows-targets 0.48.5", 585 + + "windows-targets 0.52.6", 586 + ] 587 + 588 + [[package]] 589 + @@ -4239,7 +4266,7 @@ dependencies = [ 590 + "bitflags 2.6.0", 591 + "codespan-reporting", 592 + "hexf-parse", 593 + - "indexmap 2.5.0", 594 + + "indexmap 2.10.0", 595 + "log", 596 + "num-traits", 597 + "petgraph 0.6.5", 598 + @@ -4569,7 +4596,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" 599 + dependencies = [ 600 + "proc-macro2 1.0.89", 601 + "quote 1.0.37", 602 + - "syn 2.0.79", 603 + + "syn 2.0.87", 604 + ] 605 + 606 + [[package]] 607 + @@ -4683,7 +4710,7 @@ dependencies = [ 608 + "proc-macro-crate", 609 + "proc-macro2 1.0.89", 610 + "quote 1.0.37", 611 + - "syn 2.0.79", 612 + + "syn 2.0.87", 613 + ] 614 + 615 + [[package]] 616 + @@ -4695,7 +4722,7 @@ dependencies = [ 617 + "proc-macro-crate", 618 + "proc-macro2 1.0.89", 619 + "quote 1.0.37", 620 + - "syn 2.0.79", 621 + + "syn 2.0.87", 622 + ] 623 + 624 + [[package]] 625 + @@ -4870,13 +4897,13 @@ dependencies = [ 626 + 627 + [[package]] 628 + name = "object" 629 + -version = "0.36.4" 630 + +version = "0.36.7" 631 + source = "registry+https://github.com/rust-lang/crates.io-index" 632 + -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" 633 + +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" 634 + dependencies = [ 635 + "crc32fast", 636 + - "hashbrown 0.14.5", 637 + - "indexmap 2.5.0", 638 + + "hashbrown 0.15.4", 639 + + "indexmap 2.10.0", 640 + "memchr", 641 + ] 642 + 643 + @@ -5051,7 +5078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 644 + checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" 645 + dependencies = [ 646 + "fixedbitset 0.4.2", 647 + - "indexmap 2.5.0", 648 + + "indexmap 2.10.0", 649 + ] 650 + 651 + [[package]] 652 + @@ -5288,7 +5315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 653 + checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30" 654 + dependencies = [ 655 + "quote 1.0.37", 656 + - "syn 2.0.79", 657 + + "syn 2.0.87", 658 + ] 659 + 660 + [[package]] 661 + @@ -5354,13 +5381,13 @@ dependencies = [ 662 + 663 + [[package]] 664 + name = "pulley-interpreter" 665 + -version = "26.0.1" 666 + +version = "30.0.2" 667 + source = "registry+https://github.com/rust-lang/crates.io-index" 668 + -checksum = "df33e7f8a43ccc7f93b330fef4baf271764674926f3f4d40f4a196d54de8af26" 669 + +checksum = "cb0ecb9823083f71df8735f21f6c44f2f2b55986d674802831df20f27e26c907" 670 + dependencies = [ 671 + "cranelift-bitset", 672 + "log", 673 + - "sptr", 674 + + "wasmtime-math", 675 + ] 676 + 677 + [[package]] 678 + @@ -5660,19 +5687,20 @@ dependencies = [ 679 + "quote 1.0.37", 680 + "refinery-core", 681 + "regex", 682 + - "syn 2.0.79", 683 + + "syn 2.0.87", 684 + ] 685 + 686 + [[package]] 687 + name = "regalloc2" 688 + -version = "0.10.2" 689 + +version = "0.11.2" 690 + source = "registry+https://github.com/rust-lang/crates.io-index" 691 + -checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" 692 + +checksum = "dc06e6b318142614e4a48bc725abbf08ff166694835c43c9dae5a9009704639a" 693 + dependencies = [ 694 + - "hashbrown 0.14.5", 695 + + "allocator-api2", 696 + + "bumpalo", 697 + + "hashbrown 0.15.4", 698 + "log", 699 + "rustc-hash 2.0.0", 700 + - "slice-group-by", 701 + "smallvec", 702 + ] 703 + 704 + @@ -5883,9 +5911,9 @@ dependencies = [ 705 + 706 + [[package]] 707 + name = "rustix" 708 + -version = "0.38.40" 709 + +version = "0.38.44" 710 + source = "registry+https://github.com/rust-lang/crates.io-index" 711 + -checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" 712 + +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" 713 + dependencies = [ 714 + "bitflags 2.6.0", 715 + "errno", 716 + @@ -5893,7 +5921,7 @@ dependencies = [ 717 + "libc", 718 + "linux-raw-sys", 719 + "once_cell", 720 + - "windows-sys 0.52.0", 721 + + "windows-sys 0.59.0", 722 + ] 723 + 724 + [[package]] 725 + @@ -6197,22 +6225,22 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" 726 + 727 + [[package]] 728 + name = "serde" 729 + -version = "1.0.210" 730 + +version = "1.0.219" 731 + source = "registry+https://github.com/rust-lang/crates.io-index" 732 + -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" 733 + +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" 734 dependencies = [ 735 + "serde_derive", 736 + ] 737 + 738 + [[package]] 739 + name = "serde_derive" 740 + -version = "1.0.210" 741 + +version = "1.0.219" 742 + source = "registry+https://github.com/rust-lang/crates.io-index" 743 + -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" 744 + +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" 745 + dependencies = [ 746 + "proc-macro2 1.0.89", 747 + "quote 1.0.37", 748 + - "syn 2.0.79", 749 + + "syn 2.0.87", 750 + ] 751 + 752 + [[package]] 753 + @@ -6245,7 +6273,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" 754 + dependencies = [ 755 + "proc-macro2 1.0.89", 756 + "quote 1.0.37", 757 + - "syn 2.0.79", 758 + + "syn 2.0.87", 759 + ] 760 + 761 + [[package]] 762 + @@ -6277,10 +6305,10 @@ checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" 763 + dependencies = [ 764 + "base64 0.22.1", 765 + "chrono", 766 + - "hashbrown 0.15.1", 767 + + "hashbrown 0.15.4", 768 + "hex", 769 + "indexmap 1.9.3", 770 + - "indexmap 2.5.0", 771 + + "indexmap 2.10.0", 772 + "serde", 773 + "serde_derive", 774 + "serde_json", 775 + @@ -6297,7 +6325,7 @@ dependencies = [ 776 + "darling", 777 + "proc-macro2 1.0.89", 778 + "quote 1.0.37", 779 + - "syn 2.0.79", 780 + + "syn 2.0.87", 781 + ] 782 + 783 [[package]] 784 + @@ -6458,12 +6486,6 @@ dependencies = [ 785 + "autocfg", 786 + ] 787 + 788 + -[[package]] 789 + -name = "slice-group-by" 790 + -version = "0.3.1" 791 -source = "registry+https://github.com/rust-lang/crates.io-index" 792 + -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" 793 + - 794 + [[package]] 795 + name = "slotmap" 796 + version = "1.0.7" 797 + @@ -6697,7 +6719,7 @@ dependencies = [ 798 + "proc-macro2 1.0.89", 799 + "quote 1.0.37", 800 + "rustversion", 801 + - "syn 2.0.79", 802 + + "syn 2.0.87", 803 + ] 804 + 805 + [[package]] 806 + @@ -6813,9 +6835,9 @@ dependencies = [ 807 + 808 + [[package]] 809 + name = "syn" 810 + -version = "2.0.79" 811 + +version = "2.0.87" 812 + source = "registry+https://github.com/rust-lang/crates.io-index" 813 + -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" 814 + +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" 815 + dependencies = [ 816 + "proc-macro2 1.0.89", 817 + "quote 1.0.37", 818 + @@ -6851,7 +6873,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" 819 dependencies = [ 820 + "proc-macro2 1.0.89", 821 + "quote 1.0.37", 822 + - "syn 2.0.79", 823 + + "syn 2.0.87", 824 + ] 825 + 826 + [[package]] 827 + @@ -6889,9 +6911,9 @@ dependencies = [ 828 829 [[package]] 830 + name = "target-lexicon" 831 + -version = "0.12.16" 832 + +version = "0.13.2" 833 source = "registry+https://github.com/rust-lang/crates.io-index" 834 + -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" 835 + +checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" 836 + 837 + [[package]] 838 + name = "tempfile" 839 + @@ -6932,7 +6954,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" 840 dependencies = [ 841 + "proc-macro2 1.0.89", 842 + "quote 1.0.37", 843 + - "syn 2.0.79", 844 + + "syn 2.0.87", 845 ] 846 847 + [[package]] 848 + @@ -7070,7 +7092,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" 849 + dependencies = [ 850 + "proc-macro2 1.0.89", 851 + "quote 1.0.37", 852 + - "syn 2.0.79", 853 + + "syn 2.0.87", 854 + ] 855 + 856 + [[package]] 857 + @@ -7131,7 +7153,7 @@ version = "0.19.15" 858 + source = "registry+https://github.com/rust-lang/crates.io-index" 859 + checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" 860 + dependencies = [ 861 + - "indexmap 2.5.0", 862 + + "indexmap 2.10.0", 863 + "toml_datetime", 864 + "winnow 0.5.40", 865 + ] 866 + @@ -7142,7 +7164,7 @@ version = "0.22.22" 867 + source = "registry+https://github.com/rust-lang/crates.io-index" 868 + checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" 869 + dependencies = [ 870 + - "indexmap 2.5.0", 871 + + "indexmap 2.10.0", 872 "serde", 873 + "serde_spanned", 874 + "toml_datetime", 875 + @@ -7209,7 +7231,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" 876 + dependencies = [ 877 + "proc-macro2 1.0.89", 878 + "quote 1.0.37", 879 + - "syn 2.0.79", 880 + + "syn 2.0.87", 881 + ] 882 + 883 + [[package]] 884 + @@ -7283,6 +7305,17 @@ dependencies = [ 885 + "cc", 886 ] 887 + 888 + +[[package]] 889 + +name = "trait-variant" 890 + +version = "0.1.2" 891 + +source = "registry+https://github.com/rust-lang/crates.io-index" 892 + +checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7" 893 + +dependencies = [ 894 + + "proc-macro2 1.0.89", 895 + + "quote 1.0.37", 896 + + "syn 2.0.87", 897 + +] 898 + + 899 + [[package]] 900 + name = "treeculler" 901 + version = "0.4.0" 902 + @@ -7525,7 +7558,7 @@ dependencies = [ 903 + "authc", 904 + "byteorder", 905 + "clap", 906 + - "hashbrown 0.15.1", 907 + + "hashbrown 0.15.4", 908 + "hickory-resolver", 909 + "image", 910 + "num 0.4.3", 911 + @@ -7559,7 +7592,7 @@ dependencies = [ 912 + "fluent", 913 + "fluent-bundle", 914 + "fluent-syntax", 915 + - "hashbrown 0.15.1", 916 + + "hashbrown 0.15.4", 917 + "intl-memoizer", 918 + "serde", 919 "tracing", 920 + @@ -7583,8 +7616,8 @@ dependencies = [ 921 + "dot_vox", 922 + "enum-map", 923 + "fxhash", 924 + - "hashbrown 0.15.1", 925 + - "indexmap 2.5.0", 926 + + "hashbrown 0.15.4", 927 + + "indexmap 2.10.0", 928 + "itertools 0.13.0", 929 + "kiddo", 930 "lazy_static", 931 + @@ -7621,7 +7654,7 @@ version = "0.10.0" 932 dependencies = [ 933 + "assets_manager", 934 + "dot_vox", 935 + - "hashbrown 0.15.1", 936 + + "hashbrown 0.15.4", 937 + "image", 938 "lazy_static", 939 + "ron", 940 + @@ -7676,7 +7709,7 @@ dependencies = [ 941 + name = "veloren-common-i18n" 942 + version = "0.1.0" 943 + dependencies = [ 944 + - "hashbrown 0.15.1", 945 + + "hashbrown 0.15.4", 946 + "rand", 947 + "serde", 948 ] 949 + @@ -7687,7 +7720,7 @@ version = "0.10.0" 950 + dependencies = [ 951 + "bincode", 952 + "flate2", 953 + - "hashbrown 0.15.1", 954 + + "hashbrown 0.15.4", 955 + "image", 956 "num-traits", 957 + "serde", 958 + @@ -7706,7 +7739,7 @@ dependencies = [ 959 + "bincode", 960 + "bytes", 961 + "futures", 962 + - "hashbrown 0.15.1", 963 + + "hashbrown 0.15.4", 964 + "hex", 965 + "num_cpus", 966 "rayon", 967 + @@ -7758,7 +7791,7 @@ dependencies = [ 968 + "criterion", 969 + "crossbeam-channel", 970 + "futures-util", 971 + - "hashbrown 0.15.1", 972 + + "hashbrown 0.15.4", 973 + "lazy_static", 974 + "lz-fear", 975 + "prometheus", 976 + @@ -7786,7 +7819,7 @@ dependencies = [ 977 + "bitflags 2.6.0", 978 + "bytes", 979 + "criterion", 980 + - "hashbrown 0.15.1", 981 + + "hashbrown 0.15.4", 982 + "prometheus", 983 + "rand", 984 + "tokio", 985 + @@ -7813,7 +7846,7 @@ dependencies = [ 986 + "atomic_refcell", 987 + "enum-map", 988 + "fxhash", 989 + - "hashbrown 0.15.1", 990 + + "hashbrown 0.15.4", 991 + "itertools 0.13.0", 992 + "rand", 993 + "rand_chacha", 994 + @@ -7841,7 +7874,7 @@ dependencies = [ 995 + "drop_guard", 996 + "enum-map", 997 + "futures-util", 998 + - "hashbrown 0.15.1", 999 + + "hashbrown 0.15.4", 1000 + "humantime", 1001 + "itertools 0.13.0", 1002 + "lazy_static", 1003 + @@ -7957,7 +7990,7 @@ dependencies = [ 1004 + "gilrs", 1005 + "glyph_brush", 1006 + "guillotiere", 1007 + - "hashbrown 0.15.1", 1008 + + "hashbrown 0.15.4", 1009 + "iced_native", 1010 + "iced_winit", 1011 + "image", 1012 + @@ -8063,7 +8096,7 @@ dependencies = [ 1013 + "fixed", 1014 + "flate2", 1015 + "fxhash", 1016 + - "hashbrown 0.15.1", 1017 + + "hashbrown 0.15.4", 1018 + "image", 1019 + "indicatif", 1020 + "itertools 0.13.0", 1021 + @@ -8164,7 +8197,7 @@ dependencies = [ 1022 + "once_cell", 1023 + "proc-macro2 1.0.89", 1024 + "quote 1.0.37", 1025 + - "syn 2.0.79", 1026 + + "syn 2.0.87", 1027 + "wasm-bindgen-shared", 1028 + ] 1029 + 1030 + @@ -8198,7 +8231,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" 1031 + dependencies = [ 1032 + "proc-macro2 1.0.89", 1033 + "quote 1.0.37", 1034 + - "syn 2.0.79", 1035 + + "syn 2.0.87", 1036 + "wasm-bindgen-backend", 1037 + "wasm-bindgen-shared", 1038 + ] 1039 + @@ -8211,63 +8244,64 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" 1040 + 1041 + [[package]] 1042 + name = "wasm-encoder" 1043 + -version = "0.218.0" 1044 + +version = "0.224.1" 1045 + source = "registry+https://github.com/rust-lang/crates.io-index" 1046 + -checksum = "22b896fa8ceb71091ace9bcb81e853f54043183a1c9667cf93422c40252ffa0a" 1047 + +checksum = "1ab7a13a23790fe91ea4eb7526a1f3131001d874e3e00c2976c48861f2e82920" 1048 + dependencies = [ 1049 + "leb128", 1050 + + "wasmparser 0.224.1", 1051 + ] 1052 + 1053 + [[package]] 1054 + name = "wasm-encoder" 1055 + -version = "0.220.0" 1056 + +version = "0.236.0" 1057 + source = "registry+https://github.com/rust-lang/crates.io-index" 1058 + -checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7" 1059 + +checksum = "3108979166ab0d3c7262d2e16a2190ffe784b2a5beb963edef154b5e8e07680b" 1060 + dependencies = [ 1061 + - "leb128", 1062 + - "wasmparser 0.220.0", 1063 + + "leb128fmt", 1064 + + "wasmparser 0.236.0", 1065 + ] 1066 + 1067 + [[package]] 1068 + name = "wasmparser" 1069 + -version = "0.218.0" 1070 + +version = "0.224.1" 1071 + source = "registry+https://github.com/rust-lang/crates.io-index" 1072 + -checksum = "b09e46c7fceceaa72b2dd1a8a137ea7fd8f93dfaa69806010a709918e496c5dc" 1073 + +checksum = "04f17a5917c2ddd3819e84c661fae0d6ba29d7b9c1f0e96c708c65a9c4188e11" 1074 + dependencies = [ 1075 + - "ahash 0.8.11", 1076 + "bitflags 2.6.0", 1077 + - "hashbrown 0.14.5", 1078 + - "indexmap 2.5.0", 1079 + + "hashbrown 0.15.4", 1080 + + "indexmap 2.10.0", 1081 + "semver 1.0.23", 1082 + "serde", 1083 + ] 1084 + 1085 + [[package]] 1086 + name = "wasmparser" 1087 + -version = "0.220.0" 1088 + +version = "0.236.0" 1089 + source = "registry+https://github.com/rust-lang/crates.io-index" 1090 + -checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" 1091 + +checksum = "16d1eee846a705f6f3cb9d7b9f79b54583810f1fb57a1e3aea76d1742db2e3d2" 1092 + dependencies = [ 1093 + "bitflags 2.6.0", 1094 + - "indexmap 2.5.0", 1095 + + "indexmap 2.10.0", 1096 + + "semver 1.0.23", 1097 + ] 1098 + 1099 + [[package]] 1100 + name = "wasmprinter" 1101 + -version = "0.218.0" 1102 + +version = "0.224.1" 1103 + source = "registry+https://github.com/rust-lang/crates.io-index" 1104 + -checksum = "0ace089155491837b75f474bf47c99073246d1b737393fe722d6dee311595ddc" 1105 + +checksum = "0095b53a3b09cbc2f90f789ea44aa1b17ecc2dad8b267e657c7391f3ded6293d" 1106 + dependencies = [ 1107 + "anyhow", 1108 + "termcolor", 1109 + - "wasmparser 0.218.0", 1110 + + "wasmparser 0.224.1", 1111 + ] 1112 + 1113 + [[package]] 1114 + name = "wasmtime" 1115 + -version = "26.0.1" 1116 + +version = "30.0.2" 1117 + source = "registry+https://github.com/rust-lang/crates.io-index" 1118 + -checksum = "51e762e163fd305770c6c341df3290f0cabb3c264e7952943018e9a1ced8d917" 1119 + +checksum = "809cc8780708f1deed0a7c3fcab46954f0e8c08a6fe0252772481fbc88fcf946" 1120 + dependencies = [ 1121 + "addr2line", 1122 + "anyhow", 1123 + @@ -8279,11 +8313,10 @@ dependencies = [ 1124 + "encoding_rs", 1125 + "fxprof-processed-profile", 1126 + "gimli", 1127 + - "hashbrown 0.14.5", 1128 + - "indexmap 2.5.0", 1129 + + "hashbrown 0.15.4", 1130 + + "indexmap 2.10.0", 1131 + "ittapi", 1132 + "libc", 1133 + - "libm", 1134 + "log", 1135 + "mach2", 1136 + "memfd", 1137 + @@ -8302,8 +8335,9 @@ dependencies = [ 1138 + "smallvec", 1139 + "sptr", 1140 + "target-lexicon", 1141 + - "wasm-encoder 0.218.0", 1142 + - "wasmparser 0.218.0", 1143 + + "trait-variant", 1144 + + "wasm-encoder 0.224.1", 1145 + + "wasmparser 0.224.1", 1146 + "wasmtime-asm-macros", 1147 + "wasmtime-cache", 1148 + "wasmtime-component-macro", 1149 + @@ -8313,6 +8347,7 @@ dependencies = [ 1150 + "wasmtime-fiber", 1151 + "wasmtime-jit-debug", 1152 + "wasmtime-jit-icache-coherence", 1153 + + "wasmtime-math", 1154 + "wasmtime-slab", 1155 + "wasmtime-versioned-export-macros", 1156 + "wasmtime-winch", 1157 + @@ -8322,18 +8357,18 @@ dependencies = [ 1158 + 1159 + [[package]] 1160 + name = "wasmtime-asm-macros" 1161 + -version = "26.0.1" 1162 + +version = "30.0.2" 1163 + source = "registry+https://github.com/rust-lang/crates.io-index" 1164 + -checksum = "63caa7aebb546374e26257a1900fb93579171e7c02514cde26805b9ece3ef812" 1165 + +checksum = "236964b6b35af0f08879c9c56dbfbc5adc12e8d624672341a0121df31adaa3fa" 1166 + dependencies = [ 1167 + "cfg-if 1.0.0", 1168 + ] 1169 + 1170 + [[package]] 1171 + name = "wasmtime-cache" 1172 + -version = "26.0.1" 1173 + +version = "30.0.2" 1174 + source = "registry+https://github.com/rust-lang/crates.io-index" 1175 + -checksum = "c7192f71e3afe32e858729454d9d90d6e927bd92427d688a9507d8220bddb256" 1176 + +checksum = "7a5d75ac36ee28647f6d871a93eefc7edcb729c3096590031ba50857fac44fa8" 1177 + dependencies = [ 1178 + "anyhow", 1179 + "base64 0.21.7", 1180 + @@ -8351,14 +8386,14 @@ dependencies = [ 1181 + 1182 + [[package]] 1183 + name = "wasmtime-component-macro" 1184 + -version = "26.0.1" 1185 + +version = "30.0.2" 1186 + source = "registry+https://github.com/rust-lang/crates.io-index" 1187 + -checksum = "d61a4b5ce2ad9c15655e830f0eac0c38b8def30c74ecac71f452d3901e491b68" 1188 + +checksum = "2581ef04bf33904db9a902ffb558e7b2de534d6a4881ee985ea833f187a78fdf" 1189 + dependencies = [ 1190 + "anyhow", 1191 + "proc-macro2 1.0.89", 1192 + "quote 1.0.37", 1193 + - "syn 2.0.79", 1194 + + "syn 2.0.87", 1195 + "wasmtime-component-util", 1196 + "wasmtime-wit-bindgen", 1197 + "wit-parser", 1198 + @@ -8366,15 +8401,15 @@ dependencies = [ 1199 + 1200 + [[package]] 1201 + name = "wasmtime-component-util" 1202 + -version = "26.0.1" 1203 + +version = "30.0.2" 1204 + source = "registry+https://github.com/rust-lang/crates.io-index" 1205 + -checksum = "35e87a1212270dbb84a49af13d82594e00a92769d6952b0ea7fc4366c949f6ad" 1206 + +checksum = "9a7108498a8a0afc81c7d2d81b96cdc509cd631d7bbaa271b7db5137026f10e3" 1207 + 1208 + [[package]] 1209 + name = "wasmtime-cranelift" 1210 + -version = "26.0.1" 1211 + +version = "30.0.2" 1212 + source = "registry+https://github.com/rust-lang/crates.io-index" 1213 + -checksum = "7cb40dddf38c6a5eefd5ce7c1baf43b00fe44eada11a319fab22e993a960262f" 1214 + +checksum = "abcc9179097235c91f299a8ff56b358ee921266b61adff7d14d6e48428954dd2" 1215 + dependencies = [ 1216 + "anyhow", 1217 + "cfg-if 1.0.0", 1218 + @@ -8387,26 +8422,27 @@ dependencies = [ 1219 + "itertools 0.12.1", 1220 + "log", 1221 + "object", 1222 + + "pulley-interpreter", 1223 + "smallvec", 1224 + "target-lexicon", 1225 + "thiserror", 1226 + - "wasmparser 0.218.0", 1227 + + "wasmparser 0.224.1", 1228 + "wasmtime-environ", 1229 + "wasmtime-versioned-export-macros", 1230 + ] 1231 + 1232 + [[package]] 1233 + name = "wasmtime-environ" 1234 + -version = "26.0.1" 1235 + +version = "30.0.2" 1236 + source = "registry+https://github.com/rust-lang/crates.io-index" 1237 + -checksum = "8613075e89e94a48c05862243c2b718eef1b9c337f51493ebf951e149a10fa19" 1238 + +checksum = "8e90f6cba665939381839bbf2ddf12d732fca03278867910348ef1281b700954" 1239 + dependencies = [ 1240 + "anyhow", 1241 + "cpp_demangle", 1242 + "cranelift-bitset", 1243 + "cranelift-entity", 1244 + "gimli", 1245 + - "indexmap 2.5.0", 1246 + + "indexmap 2.10.0", 1247 + "log", 1248 + "object", 1249 + "postcard", 1250 + @@ -8416,17 +8452,17 @@ dependencies = [ 1251 + "serde_derive", 1252 + "smallvec", 1253 + "target-lexicon", 1254 + - "wasm-encoder 0.218.0", 1255 + - "wasmparser 0.218.0", 1256 + + "wasm-encoder 0.224.1", 1257 + + "wasmparser 0.224.1", 1258 + "wasmprinter", 1259 + "wasmtime-component-util", 1260 + ] 1261 + 1262 + [[package]] 1263 + name = "wasmtime-fiber" 1264 + -version = "26.0.1" 1265 + +version = "30.0.2" 1266 + source = "registry+https://github.com/rust-lang/crates.io-index" 1267 + -checksum = "77acabfbcd89a4d47ad117fb31e340c824e2f49597105402c3127457b6230995" 1268 + +checksum = "ba5c2ac21f0b39d72d2dac198218a12b3ddeb4ab388a8fa0d2e429855876783c" 1269 + dependencies = [ 1270 + "anyhow", 1271 + "cc", 1272 + @@ -8439,21 +8475,21 @@ dependencies = [ 1273 + 1274 + [[package]] 1275 + name = "wasmtime-jit-debug" 1276 + -version = "26.0.1" 1277 + +version = "30.0.2" 1278 + source = "registry+https://github.com/rust-lang/crates.io-index" 1279 + -checksum = "f02a0118d471de665565ed200bc56673eaa10cc8e223dfe2cef5d50ed0d9d143" 1280 + +checksum = "74812989369947f4f5a33f4ae8ff551eb6c8a97ff55e0269a9f5f0fac93cd755" 1281 + dependencies = [ 1282 + + "cc", 1283 + "object", 1284 + - "once_cell", 1285 + "rustix", 1286 + "wasmtime-versioned-export-macros", 1287 + ] 1288 + 1289 + [[package]] 1290 + name = "wasmtime-jit-icache-coherence" 1291 + -version = "26.0.1" 1292 + +version = "30.0.2" 1293 + source = "registry+https://github.com/rust-lang/crates.io-index" 1294 + -checksum = "da47fba49af72581bc0dc67c8faaf5ee550e6f106e285122a184a675193701a5" 1295 + +checksum = "3f180cc0d2745e3a5df5d02231cd3046f49c75512eaa987b8202363b112e125d" 1296 + dependencies = [ 1297 + "anyhow", 1298 + "cfg-if 1.0.0", 1299 + @@ -8462,27 +8498,36 @@ dependencies = [ 1300 + ] 1301 + 1302 + [[package]] 1303 + -name = "wasmtime-slab" 1304 + -version = "26.0.1" 1305 + +name = "wasmtime-math" 1306 + +version = "30.0.2" 1307 + source = "registry+https://github.com/rust-lang/crates.io-index" 1308 + -checksum = "770e10cdefb15f2b6304152978e115bd062753c1ebe7221c0b6b104fa0419ff6" 1309 + +checksum = "f5f04c5dcf5b2f88f81cfb8d390294b2f67109dc4d0197ea7303c60a092df27c" 1310 + +dependencies = [ 1311 + + "libm", 1312 + +] 1313 + + 1314 + +[[package]] 1315 + +name = "wasmtime-slab" 1316 + +version = "30.0.2" 1317 + +source = "registry+https://github.com/rust-lang/crates.io-index" 1318 + +checksum = "fe9681707f1ae9a4708ca22058722fca5c135775c495ba9b9624fe3732b94c97" 1319 + 1320 + [[package]] 1321 + name = "wasmtime-versioned-export-macros" 1322 + -version = "26.0.1" 1323 + +version = "30.0.2" 1324 + source = "registry+https://github.com/rust-lang/crates.io-index" 1325 + -checksum = "db8efb877c9e5e67239d4553bb44dd2a34ae5cfb728f3cf2c5e64439c6ca6ee7" 1326 + +checksum = "dd2fe69d04986a12fc759d2e79494100d600adcb3bb79e63dedfc8e6bb2ab03e" 1327 + dependencies = [ 1328 + "proc-macro2 1.0.89", 1329 + "quote 1.0.37", 1330 + - "syn 2.0.79", 1331 + + "syn 2.0.87", 1332 + ] 1333 + 1334 + [[package]] 1335 + name = "wasmtime-wasi" 1336 + -version = "26.0.1" 1337 + +version = "30.0.2" 1338 + source = "registry+https://github.com/rust-lang/crates.io-index" 1339 + -checksum = "f16c8d87a45168131be6815045e6d46d7f6ddf65897c49444ab210488bce10dc" 1340 + +checksum = "4ce639c7d398586bc539ae9bba752084c1db7a49ab0f391a3230dcbcc6a64cfd" 1341 + dependencies = [ 1342 + "anyhow", 1343 + "async-trait", 1344 + @@ -8497,7 +8542,6 @@ dependencies = [ 1345 + "futures", 1346 + "io-extras", 1347 + "io-lifetimes", 1348 + - "once_cell", 1349 + "rustix", 1350 + "system-interface", 1351 + "thiserror", 1352 + @@ -8505,22 +8549,36 @@ dependencies = [ 1353 "tracing", 1354 + "url", 1355 + "wasmtime", 1356 + + "wasmtime-wasi-io", 1357 + "wiggle", 1358 + "windows-sys 0.59.0", 1359 + ] 1360 1361 + [[package]] 1362 + -name = "wasmtime-winch" 1363 + -version = "26.0.1" 1364 + +name = "wasmtime-wasi-io" 1365 + +version = "30.0.2" 1366 + source = "registry+https://github.com/rust-lang/crates.io-index" 1367 + -checksum = "4f7a267367382ceec3e7f7ace63a63b83d86f4a680846743dead644e10f08150" 1368 + +checksum = "bdcad7178fddaa07786abe8ff5e043acb4bc8c8f737eb117f11e028b48d92792" 1369 + +dependencies = [ 1370 + + "anyhow", 1371 + + "async-trait", 1372 + + "bytes", 1373 + + "futures", 1374 + + "wasmtime", 1375 + +] 1376 + + 1377 + +[[package]] 1378 + +name = "wasmtime-winch" 1379 + +version = "30.0.2" 1380 + +source = "registry+https://github.com/rust-lang/crates.io-index" 1381 + +checksum = "5a9c8eae8395d530bb00a388030de9f543528674c382326f601de47524376975" 1382 + dependencies = [ 1383 + "anyhow", 1384 + "cranelift-codegen", 1385 + "gimli", 1386 + "object", 1387 + "target-lexicon", 1388 + - "wasmparser 0.218.0", 1389 + + "wasmparser 0.224.1", 1390 + "wasmtime-cranelift", 1391 + "wasmtime-environ", 1392 + "winch-codegen", 1393 + @@ -8528,13 +8586,13 @@ dependencies = [ 1394 1395 + [[package]] 1396 + name = "wasmtime-wit-bindgen" 1397 + -version = "26.0.1" 1398 + +version = "30.0.2" 1399 + source = "registry+https://github.com/rust-lang/crates.io-index" 1400 + -checksum = "4bef2a726fd8d1ee9b0144655e16c492dc32eb4c7c9f7e3309fcffe637870933" 1401 + +checksum = "9a5531455e2c55994a1540355140369bb7ec0e46d2699731c5ee9f4cf9c3f7d4" 1402 + dependencies = [ 1403 + "anyhow", 1404 + "heck 0.5.0", 1405 + - "indexmap 2.5.0", 1406 + + "indexmap 2.10.0", 1407 + "wit-parser", 1408 + ] 1409 1410 + @@ -8549,24 +8607,24 @@ dependencies = [ 1411 1412 + [[package]] 1413 + name = "wast" 1414 + -version = "220.0.0" 1415 + +version = "236.0.0" 1416 + source = "registry+https://github.com/rust-lang/crates.io-index" 1417 + -checksum = "4e708c8de08751fd66e70961a32bae9d71901f14a70871e181cb8461a3bb3165" 1418 + +checksum = "11d6b6faeab519ba6fbf9b26add41617ca6f5553f99ebc33d876e591d2f4f3c6" 1419 + dependencies = [ 1420 + "bumpalo", 1421 + - "leb128", 1422 + + "leb128fmt", 1423 + "memchr", 1424 + "unicode-width 0.2.0", 1425 + - "wasm-encoder 0.220.0", 1426 + + "wasm-encoder 0.236.0", 1427 + ] 1428 + 1429 + [[package]] 1430 + name = "wat" 1431 + -version = "1.220.0" 1432 + +version = "1.236.0" 1433 + source = "registry+https://github.com/rust-lang/crates.io-index" 1434 + -checksum = "de4f1d7d59614ba690541360102b995c4eb1b9ed373701d5102cc1a968b1c5a3" 1435 + +checksum = "cc31704322400f461f7f31a5f9190d5488aaeafb63ae69ad2b5888d2704dcb08" 1436 + dependencies = [ 1437 + - "wast 220.0.0", 1438 + + "wast 236.0.0", 1439 + ] 1440 + 1441 + [[package]] 1442 + @@ -8909,9 +8967,9 @@ checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" 1443 + 1444 + [[package]] 1445 + name = "wiggle" 1446 + -version = "26.0.1" 1447 + +version = "30.0.2" 1448 + source = "registry+https://github.com/rust-lang/crates.io-index" 1449 + -checksum = "b0f25588cf5ea16f56c1af13244486d50c5a2cf67cc0c4e990c665944d741546" 1450 + +checksum = "c5a4ea7722c042a659dc70caab0b56d7f45220e8bae1241cf5ebc7ab7efb0dfb" 1451 + dependencies = [ 1452 + "anyhow", 1453 + "async-trait", 1454 + @@ -8924,28 +8982,28 @@ dependencies = [ 1455 + 1456 + [[package]] 1457 + name = "wiggle-generate" 1458 + -version = "26.0.1" 1459 + +version = "30.0.2" 1460 + source = "registry+https://github.com/rust-lang/crates.io-index" 1461 + -checksum = "28ff23bed568b335dac6a324b8b167318a0c60555199445fcc89745a5eb42452" 1462 + +checksum = "3f786d9d3e006152a360f1145bdc18e56ea22fd5d2356f1ddc2ecfcf7529a77b" 1463 + dependencies = [ 1464 + "anyhow", 1465 + "heck 0.5.0", 1466 + "proc-macro2 1.0.89", 1467 + "quote 1.0.37", 1468 + "shellexpand 2.1.2", 1469 + - "syn 2.0.79", 1470 + + "syn 2.0.87", 1471 + "witx", 1472 + ] 1473 + 1474 + [[package]] 1475 + name = "wiggle-macro" 1476 + -version = "26.0.1" 1477 + +version = "30.0.2" 1478 + source = "registry+https://github.com/rust-lang/crates.io-index" 1479 + -checksum = "7f13be83541aa0b033ac5ec8a8b59c9a8d8b32305845b8466dd066e722cb0004" 1480 + +checksum = "ceac9f94f22ccc0485aeab08187b9f211d1993aaf0ed6eeb8aed43314f6e717c" 1481 + dependencies = [ 1482 + "proc-macro2 1.0.89", 1483 + "quote 1.0.37", 1484 + - "syn 2.0.79", 1485 + + "syn 2.0.87", 1486 + "wiggle-generate", 1487 + ] 1488 + 1489 + @@ -8991,9 +9049,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" 1490 + 1491 + [[package]] 1492 + name = "winch-codegen" 1493 + -version = "26.0.1" 1494 + +version = "30.0.2" 1495 + source = "registry+https://github.com/rust-lang/crates.io-index" 1496 + -checksum = "07ab957fc71a36c63834b9b51cc2e087c4260d5ff810a5309ab99f7fbeb19567" 1497 + +checksum = "7dbd4e07bd92c7ddace2f3267bdd31d4197b5ec58c315751325d45c19bfb56df" 1498 + dependencies = [ 1499 + "anyhow", 1500 + "cranelift-codegen", 1501 + @@ -9001,7 +9059,8 @@ dependencies = [ 1502 + "regalloc2", 1503 + "smallvec", 1504 + "target-lexicon", 1505 + - "wasmparser 0.218.0", 1506 + + "thiserror", 1507 + + "wasmparser 0.224.1", 1508 + "wasmtime-cranelift", 1509 + "wasmtime-environ", 1510 + ] 1511 + @@ -9108,7 +9167,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" 1512 + dependencies = [ 1513 + "proc-macro2 1.0.89", 1514 + "quote 1.0.37", 1515 + - "syn 2.0.79", 1516 + + "syn 2.0.87", 1517 + ] 1518 + 1519 + [[package]] 1520 + @@ -9119,7 +9178,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" 1521 + dependencies = [ 1522 + "proc-macro2 1.0.89", 1523 + "quote 1.0.37", 1524 + - "syn 2.0.79", 1525 + + "syn 2.0.87", 1526 + ] 1527 + 1528 + [[package]] 1529 + @@ -9459,20 +9518,20 @@ dependencies = [ 1530 + 1531 + [[package]] 1532 + name = "wit-parser" 1533 + -version = "0.218.0" 1534 + +version = "0.224.1" 1535 + source = "registry+https://github.com/rust-lang/crates.io-index" 1536 + -checksum = "0d3d1066ab761b115f97fef2b191090faabcb0f37b555b758d3caf42d4ed9e55" 1537 + +checksum = "e3477d8d0acb530d76beaa8becbdb1e3face08929db275f39934963eb4f716f8" 1538 + dependencies = [ 1539 + "anyhow", 1540 + "id-arena", 1541 + - "indexmap 2.5.0", 1542 + + "indexmap 2.10.0", 1543 + "log", 1544 + "semver 1.0.23", 1545 + "serde", 1546 + "serde_derive", 1547 + "serde_json", 1548 + "unicode-xid 0.2.6", 1549 + - "wasmparser 0.218.0", 1550 + + "wasmparser 0.224.1", 1551 + ] 1552 + 1553 + [[package]] 1554 + @@ -9672,7 +9731,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" 1555 + dependencies = [ 1556 + "proc-macro2 1.0.89", 1557 + "quote 1.0.37", 1558 + - "syn 2.0.79", 1559 + + "syn 2.0.87", 1560 + "synstructure", 1561 + ] 1562 + 1563 + @@ -9694,7 +9753,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" 1564 + dependencies = [ 1565 + "proc-macro2 1.0.89", 1566 + "quote 1.0.37", 1567 + - "syn 2.0.79", 1568 + + "syn 2.0.87", 1569 + ] 1570 + 1571 + [[package]] 1572 + @@ -9714,7 +9773,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" 1573 + dependencies = [ 1574 + "proc-macro2 1.0.89", 1575 + "quote 1.0.37", 1576 + - "syn 2.0.79", 1577 + + "syn 2.0.87", 1578 + "synstructure", 1579 + ] 1580 + 1581 + @@ -9743,7 +9802,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" 1582 + dependencies = [ 1583 + "proc-macro2 1.0.89", 1584 + "quote 1.0.37", 1585 + - "syn 2.0.79", 1586 + + "syn 2.0.87", 1587 + ] 1588 + 1589 + [[package]] 1590 + diff --git a/common/state/Cargo.toml b/common/state/Cargo.toml 1591 + index d786873af..934e288a3 100644 1592 + --- a/common/state/Cargo.toml 1593 + +++ b/common/state/Cargo.toml 1594 + @@ -35,8 +35,8 @@ toml = { version = "0.8", optional = true } 1595 + tar = { version = "0.4.37", optional = true } 1596 + bincode = { workspace = true, optional = true } 1597 + timer-queue = "0.1.0" 1598 + -wasmtime = { version = "26.0.1", optional = true , features = ["component-model", "async"] } 1599 + -wasmtime-wasi = { version = "26.0.1", optional = true } 1600 + +wasmtime = { version = "30.0.2", optional = true , features = ["component-model", "async"] } 1601 + +wasmtime-wasi = { version = "30.0.2", optional = true } 1602 + async-trait = { workspace = true } 1603 + bytes = "^1" 1604 + futures = "0.3.30" 1605 + diff --git a/common/state/src/lib.rs b/common/state/src/lib.rs 1606 + index 11f8175a4..3d76f8f27 100644 1607 + --- a/common/state/src/lib.rs 1608 + +++ b/common/state/src/lib.rs 1609 + @@ -1,7 +1,7 @@ 1610 + //! This crate contains the [`State`] and shared between 1611 + //! server (`veloren-server`) and the client (`veloren-client`) 1612 + 1613 + -#![feature(maybe_uninit_uninit_array, maybe_uninit_array_assume_init)] 1614 + +#![feature(maybe_uninit_array_assume_init)] 1615 + 1616 + #[cfg(feature = "plugins")] pub mod plugin; 1617 + mod special_areas; 1618 + diff --git a/common/state/src/plugin/module.rs b/common/state/src/plugin/module.rs 1619 + index 72d4f9904..3189c909c 100644 1620 + --- a/common/state/src/plugin/module.rs 1621 + +++ b/common/state/src/plugin/module.rs 1622 + @@ -10,7 +10,7 @@ use wasmtime::{ 1623 + component::{Component, Linker}, 1624 + Config, Engine, Store, 1625 + }; 1626 + -use wasmtime_wasi::WasiView; 1627 + +use wasmtime_wasi::IoView; 1628 + 1629 + pub(crate) mod types_mod { 1630 + wasmtime::component::bindgen!({ 1631 + @@ -180,9 +180,10 @@ struct WasiHostCtx { 1632 + registered_bodies: HashMap<String, types::BodyIndex>, 1633 } 1634 1635 + -impl wasmtime_wasi::WasiView for WasiHostCtx { 1636 + +impl wasmtime_wasi::IoView for WasiHostCtx { 1637 + fn table(&mut self) -> &mut wasmtime::component::ResourceTable { &mut self.preview2_table } 1638 + - 1639 + +} 1640 + +impl wasmtime_wasi::WasiView for WasiHostCtx { 1641 + fn ctx(&mut self) -> &mut wasmtime_wasi::WasiCtx { &mut self.preview2_ctx } 1642 } 1643 1644 + @@ -276,7 +277,7 @@ impl information::HostEntity for WasiHostCtx { 1645 + 1646 + struct InfoStream(String); 1647 + 1648 + -impl wasmtime_wasi::HostOutputStream for InfoStream { 1649 + +impl wasmtime_wasi::OutputStream for InfoStream { 1650 + fn write(&mut self, bytes: bytes::Bytes) -> wasmtime_wasi::StreamResult<()> { 1651 + tracing::info!("{}: {}", self.0, String::from_utf8_lossy(bytes.as_ref())); 1652 + Ok(()) 1653 + @@ -288,13 +289,13 @@ impl wasmtime_wasi::HostOutputStream for InfoStream { 1654 } 1655 1656 + #[wasmtime_wasi::async_trait] 1657 + -impl wasmtime_wasi::Subscribe for InfoStream { 1658 + +impl wasmtime_wasi::Pollable for InfoStream { 1659 + async fn ready(&mut self) {} 1660 + } 1661 1662 + struct ErrorStream(String); 1663 1664 + -impl wasmtime_wasi::HostOutputStream for ErrorStream { 1665 + +impl wasmtime_wasi::OutputStream for ErrorStream { 1666 + fn write(&mut self, bytes: bytes::Bytes) -> wasmtime_wasi::StreamResult<()> { 1667 + tracing::error!("{}: {}", self.0, String::from_utf8_lossy(bytes.as_ref())); 1668 + Ok(()) 1669 + @@ -306,14 +307,14 @@ impl wasmtime_wasi::HostOutputStream for ErrorStream { 1670 } 1671 1672 + #[wasmtime_wasi::async_trait] 1673 + -impl wasmtime_wasi::Subscribe for ErrorStream { 1674 + +impl wasmtime_wasi::Pollable for ErrorStream { 1675 + async fn ready(&mut self) {} 1676 } 1677 1678 + struct LogStream(String, tracing::Level); 1679 1680 + impl wasmtime_wasi::StdoutStream for LogStream { 1681 + - fn stream(&self) -> Box<dyn wasmtime_wasi::HostOutputStream> { 1682 + + fn stream(&self) -> Box<dyn wasmtime_wasi::OutputStream> { 1683 + if self.1 == tracing::Level::INFO { 1684 + Box::new(InfoStream(self.0.clone())) 1685 } else { 1686 + diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs 1687 + index a9273e7c8..70ca5dd10 100644 1688 + --- a/voxygen/src/lib.rs 1689 + +++ b/voxygen/src/lib.rs 1690 + @@ -14,7 +14,6 @@ 1691 + slice_as_chunks, 1692 + let_chains, 1693 + generic_const_exprs, 1694 + - maybe_uninit_uninit_array, 1695 + maybe_uninit_array_assume_init, 1696 + closure_lifetime_binder 1697 + )] 1698 + 1699 + commit d585b16256152fff3eaa69ec2b5b75dbe1c53f7a 1700 + Author: Isse <git@isse.rs> 1701 + Date: Thu Jan 23 12:32:17 2025 +0100 1702 + 1703 + Don't use vek::repr_simd 1704 + 1705 + diff --git a/common/Cargo.toml b/common/Cargo.toml 1706 + index b11b5ad6f..4515fadbd 100644 1707 + --- a/common/Cargo.toml 1708 + +++ b/common/Cargo.toml 1709 + @@ -32,7 +32,7 @@ serde = { workspace = true, features = ["rc"] } 1710 1711 + # Util 1712 + enum-map = { workspace = true, features = ["serde"] } 1713 + -vek = { workspace = true, features = ["repr_simd"] } 1714 + +vek = { workspace = true } 1715 + chrono = { workspace = true } 1716 + chrono-tz = { workspace = true } 1717 + itertools = { workspace = true } 1718 + diff --git a/common/src/comp/ori.rs b/common/src/comp/ori.rs 1719 + index 567332430..93ab1f49a 100644 1720 + --- a/common/src/comp/ori.rs 1721 + +++ b/common/src/comp/ori.rs 1722 + @@ -364,6 +364,7 @@ impl From<Quaternion<f32>> for Ori { 1723 + fn from(quat: Quaternion<f32>) -> Self { Self::new(quat) } 1724 + } 1725 1726 + +/* 1727 + impl From<vek::quaternion::repr_simd::Quaternion<f32>> for Ori { 1728 + fn from( 1729 + vek::quaternion::repr_simd::Quaternion { x, y, z, w }: vek::quaternion::repr_simd::Quaternion<f32>, 1730 + @@ -371,16 +372,19 @@ impl From<vek::quaternion::repr_simd::Quaternion<f32>> for Ori { 1731 + Self::from(Quaternion { x, y, z, w }) 1732 + } 1733 + } 1734 + +*/ 1735 + 1736 + impl From<Ori> for Quaternion<f32> { 1737 + fn from(Ori(q): Ori) -> Self { q } 1738 + } 1739 + 1740 + +/* 1741 + impl From<Ori> for vek::quaternion::repr_simd::Quaternion<f32> { 1742 + fn from(Ori(Quaternion { x, y, z, w }): Ori) -> Self { 1743 + vek::quaternion::repr_simd::Quaternion { x, y, z, w } 1744 } 1745 } 1746 + +*/ 1747 1748 + impl From<Ori> for Dir { 1749 + fn from(ori: Ori) -> Self { ori.look_dir() } 1750 + @@ -390,17 +394,21 @@ impl From<Ori> for Vec3<f32> { 1751 + fn from(ori: Ori) -> Self { ori.look_vec() } 1752 + } 1753 + 1754 + +/* 1755 + impl From<Ori> for vek::vec::repr_simd::Vec3<f32> { 1756 + fn from(ori: Ori) -> Self { vek::vec::repr_simd::Vec3::from(ori.look_vec()) } 1757 + } 1758 + +*/ 1759 + 1760 + impl From<Ori> for Vec2<f32> { 1761 + fn from(ori: Ori) -> Self { ori.look_dir().to_horizontal().unwrap_or_default().xy() } 1762 + } 1763 + 1764 + +/* 1765 + impl From<Ori> for vek::vec::repr_simd::Vec2<f32> { 1766 + fn from(ori: Ori) -> Self { vek::vec::repr_simd::Vec2::from(ori.look_vec().xy()) } 1767 + } 1768 + +*/ 1769 + 1770 + // Validate at Deserialization 1771 + #[derive(Copy, Clone, Default, Debug, PartialEq, Serialize, Deserialize)] 1772 + diff --git a/voxygen/anim/src/plugin/mod.rs b/voxygen/anim/src/plugin/mod.rs 1773 + index 224cc644e..534f6426d 100644 1774 + --- a/voxygen/anim/src/plugin/mod.rs 1775 + +++ b/voxygen/anim/src/plugin/mod.rs 1776 + @@ -5,7 +5,8 @@ use super::{ 1777 + Skeleton, 1778 + }; 1779 + use common::comp; 1780 + -use vek::quaternion::repr_simd::Quaternion; 1781 + +// use vek::quaternion::repr_simd::Quaternion; 1782 + +use vek::Quaternion; 1783 + 1784 + pub type Body = comp::plugin::Body; 1785 + 1786 + diff --git a/voxygen/anim/src/vek.rs b/voxygen/anim/src/vek.rs 1787 + index a056cd664..b4ded62a9 100644 1788 + --- a/voxygen/anim/src/vek.rs 1789 + +++ b/voxygen/anim/src/vek.rs 1790 + @@ -1,8 +1,10 @@ 1791 + +/* 1792 + pub use ::vek::{ 1793 + geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, quaternion::repr_simd::*, 1794 + transform::repr_simd::*, transition::*, vec::repr_simd::*, 1795 + }; 1796 + -/*pub use ::vek::{ 1797 + +*/ 1798 + +pub use ::vek::{ 1799 + bezier::repr_c::*, geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, 1800 + quaternion::repr_c::*, transform::repr_c::*, transition::*, vec::repr_c::*, 1801 + -};*/ 1802 + +}; 1803 + diff --git a/voxygen/src/scene/math.rs b/voxygen/src/scene/math.rs 1804 + index 6caf30b7d..7ca3d7953 100644 1805 + --- a/voxygen/src/scene/math.rs 1806 + +++ b/voxygen/src/scene/math.rs 1807 + @@ -1,9 +1,10 @@ 1808 + use core::{iter, mem}; 1809 + use hashbrown::HashMap; 1810 + use num::traits::Float; 1811 + +/* 1812 + pub use vek::{geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, vec::repr_simd::*}; 1813 + -//pub use vek::{geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, 1814 + -// vec::repr_c::*}; 1815 + +*/ 1816 + +pub use vek::{geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, vec::repr_c::*}; 1817 + 1818 + pub fn aabb_to_points<T: Float>(bounds: Aabb<T>) -> [Vec3<T>; 8] { 1819 + [
+7 -6
pkgs/by-name/ve/veloren/package.nix
··· 14 let 15 # Note: use this to get the release metadata 16 # https://gitlab.com/api/v4/projects/10174980/repository/tags/v{version} 17 - version = "0.16.0"; 18 - date = "2023-03-30-03:28"; 19 - rev = "80fe5ca64b40fbf3e0e393a44f8880a79a6a5380"; 20 in 21 22 rustPlatform.buildRustPackage { ··· 27 owner = "veloren"; 28 repo = "veloren"; 29 inherit rev; 30 - hash = "sha256-h2hLO227aeK2oEFfdGMgmtMkA9cn9AgQ9w6myb+8W8c="; 31 }; 32 33 cargoPatches = [ ··· 35 ./fix-assets-path.patch 36 ]; 37 38 - cargoHash = "sha256-3XHuAgue0Id1oxCJ8NLZ4wYjMfND+C1iIW+AnMKXd54="; 39 40 postPatch = '' 41 # Force vek to build in unstable mode ··· 61 env = { 62 # Enable unstable features, see https://gitlab.com/veloren/veloren/-/issues/264 63 RUSTC_BOOTSTRAP = true; 64 65 # Set version info, required by veloren-common 66 NIX_GIT_TAG = "v${version}"; 67 - NIX_GIT_HASH = "${lib.substring 0 7 rev}/${date}"; 68 69 # Save game data under user's home directory, 70 # otherwise it defaults to $out/bin/../userdata
··· 14 let 15 # Note: use this to get the release metadata 16 # https://gitlab.com/api/v4/projects/10174980/repository/tags/v{version} 17 + version = "0.17.0"; 18 + date = "2024-12-28-12:49"; 19 + rev = "a1be5a7bece7af43ebd76910eb0020c1cf3c0798"; 20 in 21 22 rustPlatform.buildRustPackage { ··· 27 owner = "veloren"; 28 repo = "veloren"; 29 inherit rev; 30 + hash = "sha256-AnmXn4GWzxu27FUyQIIVnANtu3sr0NIi7seN7buAtL8="; 31 }; 32 33 cargoPatches = [ ··· 35 ./fix-assets-path.patch 36 ]; 37 38 + cargoHash = "sha256-Uj0gFcStWhIS+GbM/Hn/vD2PrA0ftzEnMnCwV0n0g7g="; 39 40 postPatch = '' 41 # Force vek to build in unstable mode ··· 61 env = { 62 # Enable unstable features, see https://gitlab.com/veloren/veloren/-/issues/264 63 RUSTC_BOOTSTRAP = true; 64 + RUSTC_BREAK_ON_ICE = true; 65 66 # Set version info, required by veloren-common 67 NIX_GIT_TAG = "v${version}"; 68 + NIX_GIT_HASH = "${lib.substring 0 8 rev}/${date}"; 69 70 # Save game data under user's home directory, 71 # otherwise it defaults to $out/bin/../userdata