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

Browse Source
This commit is contained in:
Marcel Märtens 2022-11-28 12:10:07 +01:00
parent 97903f9092
commit ba3747a3f0
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/lib.rs
View File

@ -1789,7 +1789,8 @@ impl Client {
true, true,
); );
// TODO: avoid emitting these in the first place // TODO: avoid emitting these in the first place
self.state let _ = self
.state
.ecs() .ecs()
.fetch::<EventBus<common::event::ServerEvent>>() .fetch::<EventBus<common::event::ServerEvent>>()
.recv_all(); .recv_all();

1
common/src/lib.rs
View File

@ -11,7 +11,6 @@
trait_alias, trait_alias,
type_alias_impl_trait, type_alias_impl_trait,
extend_one, extend_one,
arbitrary_enum_discriminant,
arbitrary_self_types arbitrary_self_types
)] )]
#![feature(hash_drain_filter)] #![feature(hash_drain_filter)]

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2022-09-23 nightly-2022-11-28

1
voxygen/src/lib.rs
View File

@ -11,7 +11,6 @@
option_get_or_insert_default, option_get_or_insert_default,
map_try_insert, map_try_insert,
slice_as_chunks, slice_as_chunks,
unzip_option,
let_chains let_chains
)] )]
#![recursion_limit = "2048"] #![recursion_limit = "2048"]

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

@ -814,7 +814,6 @@ impl<V: RectRasterableVol> Terrain<V> {
} }
/// Maintain terrain data. To be called once per tick. /// Maintain terrain data. To be called once per tick.
#[allow(clippy::for_loops_over_fallibles)] // TODO: Pending review in #587
pub fn maintain( pub fn maintain(
&mut self, &mut self,
renderer: &mut Renderer, renderer: &mut Renderer,
@ -1019,7 +1018,8 @@ impl<V: RectRasterableVol> Terrain<V> {
span!(guard, "Queue meshing from todo list"); span!(guard, "Queue meshing from todo list");
let mesh_focus_pos = focus_pos.map(|e| e.trunc()).xy().as_::<i64>(); let mesh_focus_pos = focus_pos.map(|e| e.trunc()).xy().as_::<i64>();
for (todo, chunk) in self //TODO: this is actually no loop, it just runs for a single entry because of the `min_by_key`. Evaluate actually looping here
while let Some((todo, chunk)) = self
.mesh_todo .mesh_todo
.values_mut() .values_mut()
.filter(|todo| !todo.is_worker_active) .filter(|todo| !todo.is_worker_active)

2
world/src/lib.rs
View File

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