update toolchain to nightly-2024-07-07

common/src/lib.rs

@@ -13,8 +13,7 @@
     extend_one,
     arbitrary_self_types,
     int_roundings,
-    hash_extract_if,
+    hash_extract_if
-    option_take_if
 )]
 
 pub use common_assets as assets;

rust-toolchain

@@ -1 +1 @@
-nightly-2024-05-14
+nightly-2024-07-07

server/src/persistence/character.rs

@@ -1116,8 +1116,7 @@ pub fn update(
             .unzip();
         trace!(
             "Upserting items {:?} for character_id {}",
-            upserted_items,
+            upserted_items, char_id.0
-            char_id.0
         );
 
         // When moving inventory items around, foreign key constraints on

voxygen/src/audio/music.rs

@@ -313,8 +313,7 @@ impl MusicMgr {
             }
             trace!(
                 "pre-play_random_track: {:?} {:?}",
-                self.last_activity,
+                self.last_activity, music_state
-                music_state
             );
             if let Ok(next_activity) = self.play_random_track(audio, state, client, &music_state) {
                 self.last_activity = next_activity;

voxygen/src/session/interactable.rs

@@ -116,12 +116,14 @@ impl Interactable {
 /// interact with if the interact key is pressed
 /// Selected in the following order:
 /// 1) Targeted items, in order of nearest under cursor:
-///   a) entity (if within range)
+///
-///   b) collectable
+///    a) entity (if within range)
-///   c) can be mined, and is a mine sprite (Air) not a weak rock.
+///    b) collectable
+///    c) can be mined, and is a mine sprite (Air) not a weak rock.
 ///
 /// 2) outside of targeted cam ray
-///   -> closest of nearest interactable entity/block
+///
+///    -> closest of nearest interactable entity/block
 pub(super) fn select_interactable(
     client: &Client,
     collect_target: Option<Target<target::Collectable>>,

world/examples/chunk_compression_benchmarks.rs

@@ -1243,12 +1243,7 @@ fn main() {
                 }
                 trace!(
                     "{} {}: uncompressed: {}, {:?} {} {:?}",
-                    spiralpos.x,
+                    spiralpos.x, spiralpos.y, n, sizes, best_idx, timings
-                    spiralpos.y,
-                    n,
-                    sizes,
-                    best_idx,
-                    timings
                 );
                 for (name, size) in sizes.iter() {
                     *totals.entry(name).or_default() += size;

world/src/site/economy/mod.rs

@@ -451,9 +451,7 @@ impl Economy {
                         missing_collect += collect - collect_capacity;
                         trace!(
                             "missing capacity {:?}/{:?} {:?}",
-                            missing_trade,
+                            missing_trade, amount, potential_balance,
-                            amount,
-                            potential_balance,
                         );
                         amount = (amount - missing_trade).max(0.0); // you won't be able to transport it from elsewhere either, so don't count multiple times
                     }
@@ -485,9 +483,7 @@ impl Economy {
                                     }
                                     trace!(
                                         "can't carry payment {:?} {:?} {:?}",
-                                        g2,
+                                        g2, dispatch, dispatch_capacity
-                                        dispatch,
-                                        dispatch_capacity
                                     );
                                     dispatch = dispatch_capacity;
                                 }
@@ -511,10 +507,7 @@ impl Economy {
                         amount -= buy_target;
                         trace!(
                             "deal amount {:?} end_balance {:?} price {:?} left {:?}",
-                            buy_target,
+                            buy_target, balance, *price, amount
-                            balance,
-                            *price,
-                            amount
                         );
                     }
                 }