Merge branch 'xMAC94x/update_toolchain' into 'master'

update toolchain to  2024-07-07

See merge request veloren/veloren!4522

.gitlab-ci.yml

@@ -13,7 +13,7 @@ variables:
   # https://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
   GIT_DEPTH: 3
   GIT_CLEAN_FLAGS: -f
-  CACHE_IMAGE_TAG: 50187fcf
+  CACHE_IMAGE_TAG: 02724a80
   TAG_REGEX: '/^v[0-9]+\.[0-9]+\.[0-9]+$/'
 
 default:

Cargo.lock

@@ -3626,9 +3626,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.39"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
+checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6"
 dependencies = [
  "cc",
  "libc",
@@ -3901,9 +3901,9 @@ dependencies = [
 
 [[package]]
 name = "mimalloc"
-version = "0.1.43"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
+checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176"
 dependencies = [
  "libmimalloc-sys",
 ]

common/src/lib.rs

@@ -13,8 +13,7 @@
     extend_one,
     arbitrary_self_types,
     int_roundings,
-    hash_extract_if,
-    option_take_if
+    hash_extract_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,
-            char_id.0
+            upserted_items, 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,
-                music_state
+                self.last_activity, 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
-///   c) can be mined, and is a mine sprite (Air) not a weak rock.
+///
+///    a) entity (if within range)
+///    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.y,
-                    n,
-                    sizes,
-                    best_idx,
-                    timings
+                    spiralpos.x, 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,
-                            amount,
-                            potential_balance,
+                            missing_trade, 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,
-                                        dispatch,
-                                        dispatch_capacity
+                                        g2, dispatch, dispatch_capacity
                                     );
                                     dispatch = dispatch_capacity;
                                 }
@@ -511,10 +507,7 @@ impl Economy {
                         amount -= buy_target;
                         trace!(
                             "deal amount {:?} end_balance {:?} price {:?} left {:?}",
-                            buy_target,
-                            balance,
-                            *price,
-                            amount
+                            buy_target, balance, *price, amount
                         );
                     }
                 }