From ba3747a3f07f648768abe0eba6483bd7cccaebad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Mon, 28 Nov 2022 12:10:07 +0100
Subject: [PATCH] update toolchain

---
 client/src/lib.rs            | 3 ++-
 common/src/lib.rs            | 1 -
 rust-toolchain               | 2 +-
 voxygen/src/lib.rs           | 1 -
 voxygen/src/scene/terrain.rs | 4 ++--
 world/src/lib.rs             | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 78b70022ab..1922b4c809 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -1789,7 +1789,8 @@ impl Client {
             true,
         );
         // TODO: avoid emitting these in the first place
-        self.state
+        let _ = self
+            .state
             .ecs()
             .fetch::<EventBus<common::event::ServerEvent>>()
             .recv_all();
diff --git a/common/src/lib.rs b/common/src/lib.rs
index d9675bb3a3..7c125466fb 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -11,7 +11,6 @@
     trait_alias,
     type_alias_impl_trait,
     extend_one,
-    arbitrary_enum_discriminant,
     arbitrary_self_types
 )]
 #![feature(hash_drain_filter)]
diff --git a/rust-toolchain b/rust-toolchain
index 0f65080bf5..c7c6217087 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2022-09-23
+nightly-2022-11-28
diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs
index 68b25a901c..9f157c2529 100644
--- a/voxygen/src/lib.rs
+++ b/voxygen/src/lib.rs
@@ -11,7 +11,6 @@
     option_get_or_insert_default,
     map_try_insert,
     slice_as_chunks,
-    unzip_option,
     let_chains
 )]
 #![recursion_limit = "2048"]
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index 7045a77f0f..d0f79a9313 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -814,7 +814,6 @@ impl<V: RectRasterableVol> Terrain<V> {
     }
 
     /// Maintain terrain data. To be called once per tick.
-    #[allow(clippy::for_loops_over_fallibles)] // TODO: Pending review in #587
     pub fn maintain(
         &mut self,
         renderer: &mut Renderer,
@@ -1019,7 +1018,8 @@ impl<V: RectRasterableVol> Terrain<V> {
 
         span!(guard, "Queue meshing from todo list");
         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
             .values_mut()
             .filter(|todo| !todo.is_worker_active)
diff --git a/world/src/lib.rs b/world/src/lib.rs
index de5d9f6251..6c12ecb1b0 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -7,7 +7,7 @@
 )]
 #![allow(clippy::branches_sharing_code)] // TODO: evaluate
 #![deny(clippy::clone_on_ref_ptr)]
-#![feature(option_zip, arbitrary_enum_discriminant, int_log, map_first_last)]
+#![feature(option_zip)]
 
 mod all;
 mod block;