steal sharps clippy improvements to the old nightly

client/src/lib.rs

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

common/src/lib.rs

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

common/systems/src/lib.rs

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

rust-toolchain

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

server/src/lib.rs

@@ -2,8 +2,10 @@
 #![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,

voxygen/anim/src/lib.rs

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

voxygen/src/lib.rs

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

voxygen/src/scene/terrain.rs

@@ -554,7 +554,7 @@ impl SpriteRenderContext {
             }
         });
 
-        let init = core::cell::OnceCell::new();
+        let init = core::lazy::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

world/src/lib.rs

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