update rust

Author: mejrs

osrs_py/rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2025-03-01"
+channel = "nightly-2026-07-05"
 components = [ "rustfmt", "clippy" ]
 profile = "minimal"

rs3_py/rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2025-03-01"
+channel = "nightly-2026-07-05"
 components = [ "rustfmt", "clippy" ]
 profile = "minimal"

rs3cache_backend/src/index/dat2.rs

@@ -159,10 +159,7 @@ impl CacheIndex<Initial> {
                 // Let's try looking somewhere else
                 Err(_) => {
                     let alt_path = path!(input / "keys.json");
-                    match Xtea::load(alt_path) {
-                        Ok(file) => Some(file),
-                        Err(e) => return Err(e),
-                    }
+                    Some(Xtea::load(alt_path)?)
                 }
             }
         } else {

rs3cache_backend/src/lib.rs

@@ -1,6 +1,10 @@
 //! Core cache interpreting utilities.
 
-#![feature(error_generic_member_access, error_iter, cfg_eval, try_blocks, array_chunks, if_let_guard, let_chains)]
+#![feature(error_generic_member_access)]
+#![feature(error_iter)]
+#![feature(cfg_eval)]
+#![feature(try_blocks)]
+#![cfg_attr(feature = "dat2", feature(iter_array_chunks))]
 #![allow(clippy::result_large_err, unexpected_cfgs)]
 #![warn(
     unused_qualifications,

rs3cache_backend/src/xtea.rs

@@ -48,10 +48,10 @@ impl Xtea {
 
     pub fn decrypt(input: impl AsRef<[u8]>, xtea: Xtea) -> Vec<u8> {
         let input = input.as_ref();
-        let mut iter = input.array_chunks::<8>();
-        let mut output: Vec<u8> = iter.by_ref().flat_map(|block| Xtea::decrypt_block(*block, &xtea)).collect();
+        let mut iter = input.iter().copied().array_chunks::<8>();
+        let mut output: Vec<u8> = iter.by_ref().flat_map(|block| Xtea::decrypt_block(block, &xtea)).collect();
 
-        output.extend(iter.remainder());
+        output.extend(iter.into_remainder());
         output
     }
 }

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2025-03-01"
+channel = "nightly-2026-07-05"
 components = [ "rustfmt", "clippy" ]
 profile = "minimal"

src/definitions/enums.rs

@@ -21,8 +21,9 @@ use serde::Serialize;
 
 use crate::definitions::indextype::IndexType;
 
-#[derive(Debug, PartialEq, Eq, Hash, Serialize, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Hash, Serialize, Clone, Copy, Default)]
 pub enum KeyType {
+    #[default]
     Uninit = -1,
     Int0 = 0,
     Int9 = 9,
@@ -87,14 +88,9 @@ impl KeyType {
     }
 }
 
-impl Default for KeyType {
-    fn default() -> Self {
-        Self::Uninit
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Serialize, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Hash, Serialize, Clone, Copy, Default)]
 pub enum ValueType {
+    #[default]
     Uninit = -1,
     Int0 = 0,
     Int1 = 1,
@@ -192,12 +188,6 @@ impl ValueType {
     }
 }
 
-impl Default for ValueType {
-    fn default() -> Self {
-        Self::Uninit
-    }
-}
-
 #[derive(Serialize, Debug, Eq, PartialEq, Clone)]
 #[serde(untagged)]
 pub enum Value {

src/ffi/python/mapsquares.rs

@@ -191,10 +191,7 @@ impl PyMapSquare {
                 file: crate::definitions::indextype::MapFileType::WATER_LOCATIONS,
             })
             .context(error::Integrity)?;
-        let water_locations = match water_locations {
-            Ok(v) => v,
-            Err(e) => return Err(e.into()),
-        };
+        let water_locations = water_locations.as_ref()?;
         Ok(PyList::new(py, water_locations.iter().copied()))
     }
 

src/lib.rs

@@ -1,6 +1,8 @@
 #![doc = include_str!("../README.md")]
-#![feature(cfg_eval, doc_cfg, try_blocks, yeet_expr)]
-#![allow(clippy::too_many_arguments, clippy::type_complexity)]
+#![feature(doc_cfg)]
+#![feature(try_blocks)]
+#![feature(yeet_expr)]
+#![allow(clippy::too_many_arguments, clippy::type_complexity, clippy::result_large_err)]
 #![warn(
     unused_qualifications,
     unused_import_braces,