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 2022-09-08

Browse Source 
This reverts commit 6c9deee491.
This reverts commit a32b269252.
This commit is contained in:
Marcel Märtens 2022-09-12 09:23:22 +02:00
parent 3490600ca0
commit c2b453f6f1
12 changed files with 47 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -7763,7 +7763,7 @@ dependencies = [
[[package]]
name = "wgpu"
version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
source = "git+https://github.com/pythonesque/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
dependencies = [
"arrayvec 0.5.2",
"js-sys",
@ -7783,7 +7783,7 @@ dependencies = [
[[package]]
name = "wgpu-core"
version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
source = "git+https://github.com/pythonesque/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
dependencies = [
"arrayvec 0.5.2",
"bitflags",
@ -7823,7 +7823,7 @@ dependencies = [
[[package]]
name = "wgpu-types"
version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
source = "git+https://github.com/pythonesque/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
dependencies = [
"bitflags",
"serde",

3
Cargo.toml
View File

@ -117,7 +117,8 @@ key = "veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc="
[patch.crates-io]
vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986c5477341bea4456be26" }
# patch wgpu so we can use wgpu-profiler crate
wgpu = { git = "https://github.com/gfx-rs/wgpu.git", rev = "a92b8549a8e2cb9dac781bafc5ed32828f3caf46" }
# wgpu = { git = "https://github.com/gfx-rs/wgpu.git", rev = "a92b8549a8e2cb9dac781bafc5ed32828f3caf46" }
wgpu = { git = "https://github.com/pythonesque/wgpu.git", rev = "179ea209374a92837cde252f1d9ee01f628cae08" }
# # use the latest fixes in naga (remove when updates trickle down to wgpu-rs)
# naga = { git = "https://github.com/gfx-rs/naga.git", rev = "3a0f0144112ff621dd7f731bf455adf6cab19164" }

2
client/src/lib.rs
View File

@ -1,6 +1,6 @@
#![deny(unsafe_code)]
#![deny(clippy::clone_on_ref_ptr)]
#![feature(label_break_value, option_zip, bool_to_option)]
#![feature(option_zip)]
pub mod addr;
pub mod error;

2
common/src/lib.rs
View File

@ -5,9 +5,7 @@
#![deny(clippy::clone_on_ref_ptr)]
#![feature(
associated_type_defaults,
bool_to_option,
fundamental,
label_break_value,
let_chains,
option_zip,
trait_alias,

2
common/systems/src/lib.rs
View File

@ -1,4 +1,4 @@
#![feature(let_else, btree_drain_filter, bool_to_option)]
#![feature(let_else, btree_drain_filter)]
#![allow(clippy::option_map_unit_fn)]
mod aura;

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2022-04-25
nightly-2022-09-08

2
server/src/lib.rs
View File

@ -2,10 +2,8 @@
#![allow(clippy::option_map_unit_fn)]
#![deny(clippy::clone_on_ref_ptr)]
#![feature(
bool_to_option,
box_patterns,
drain_filter,
label_break_value,
let_chains,
let_else,
never_type,

2
voxygen/anim/src/lib.rs
View File

@ -1,4 +1,4 @@
#![feature(generic_associated_types, bool_to_option)]
#![feature(generic_associated_types)]
#![allow(incomplete_features)]
#![allow(clippy::single_match)]
#[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))]

72
voxygen/anim/src/quadruped_low/mod.rs
View File

@ -331,44 +331,44 @@ impl<'a> From<&'a Body> for SkeletonAttr {
_ => (0.0, 1.0),
},
scaler: match (body.species, body.body_type) {
(Crocodile, _) => (1.05),
(SeaCrocodile, _) => (1.05),
(Alligator, _) => (1.12),
(Salamander, _) => (1.12),
(Elbst, _) => (1.12),
(Monitor, _) => (0.9),
(Asp, _) => (1.12),
(Rocksnapper, _) => (1.12),
(Rootsnapper, _) => (1.12),
(Reefsnapper, _) => (1.12),
(Hakulaq, _) => (1.05),
(Dagon, _) => (1.05),
(Pangolin, _) => (1.05),
(Maneater, _) => (1.12),
(Lavadrake, _) => (1.12),
(Icedrake, _) => (1.12),
(Basilisk, _) => (1.3),
_ => (0.9),
(Crocodile, _) => 1.05,
(SeaCrocodile, _) => 1.05,
(Alligator, _) => 1.12,
(Salamander, _) => 1.12,
(Elbst, _) => 1.12,
(Monitor, _) => 0.9,
(Asp, _) => 1.12,
(Rocksnapper, _) => 1.12,
(Rootsnapper, _) => 1.12,
(Reefsnapper, _) => 1.12,
(Hakulaq, _) => 1.05,
(Dagon, _) => 1.05,
(Pangolin, _) => 1.05,
(Maneater, _) => 1.12,
(Lavadrake, _) => 1.12,
(Icedrake, _) => 1.12,
(Basilisk, _) => 1.3,
_ => 0.9,
},
tempo: match (body.species, body.body_type) {
(Crocodile, _) => (0.7),
(SeaCrocodile, _) => (0.7),
(Alligator, _) => (0.7),
(Salamander, _) => (0.85),
(Elbst, _) => (0.85),
(Monitor, _) => (1.4),
(Tortoise, _) => (0.7),
(Rocksnapper, _) => (0.7),
(Rootsnapper, _) => (0.7),
(Reefsnapper, _) => (0.7),
(Hakulaq, _) => (1.2),
(Dagon, _) => (1.2),
(Pangolin, _) => (1.15),
(Maneater, _) => (0.9),
(Lavadrake, _) => (1.1),
(Icedrake, _) => (1.1),
(Basilisk, _) => (0.8),
_ => (1.0),
(Crocodile, _) => 0.7,
(SeaCrocodile, _) => 0.7,
(Alligator, _) => 0.7,
(Salamander, _) => 0.85,
(Elbst, _) => 0.85,
(Monitor, _) => 1.4,
(Tortoise, _) => 0.7,
(Rocksnapper, _) => 0.7,
(Rootsnapper, _) => 0.7,
(Reefsnapper, _) => 0.7,
(Hakulaq, _) => 1.2,
(Dagon, _) => 1.2,
(Pangolin, _) => 1.15,
(Maneater, _) => 0.9,
(Lavadrake, _) => 1.1,
(Icedrake, _) => 1.1,
(Basilisk, _) => 0.8,
_ => 1.0,
},
}
}

1
voxygen/src/lib.rs
View File

@ -5,7 +5,6 @@
#![feature(
array_methods,
array_zip,
bool_to_option,
drain_filter,
once_cell,
trait_alias,

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

@ -554,7 +554,7 @@ impl SpriteRenderContext {
}
});
let init = core::lazy::OnceCell::new();
let init = core::cell::OnceCell::new();
let mut join_handle = Some(join_handle);
let mut closure = move |renderer: &mut Renderer| {
// The second unwrap can only fail if the sprite meshing thread panics, which

8
world/src/lib.rs
View File

@ -7,13 +7,7 @@
)]
#![allow(clippy::branches_sharing_code)] // TODO: evaluate
#![deny(clippy::clone_on_ref_ptr)]
#![feature(
bool_to_option,
label_break_value,
option_zip,
arbitrary_enum_discriminant,
let_else
)]
#![feature(option_zip, arbitrary_enum_discriminant, let_else)]
mod all;
mod block;