various updates

Author: mejrs

Cargo.toml

@@ -63,6 +63,7 @@ error = {git = "https://github.com/mejrs/error", rev = "82c78704fec42b0c35eb65dd
 [features]
 pyo3 = ["dep:pyo3", "rs3cache_backend/pyo3", "rs3cache_macros"]
 mockdata = ["rs3cache_backend/mockdata"]
+save_mockdata = []
 fast = []
 rs3 = ["rs3cache_backend/sqlite", "filetime"]
 osrs = ["rs3cache_backend/dat2"]

osrs_py/rust-toolchain.toml

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

rs3_py/rust-toolchain.toml

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

rs3cache_backend/src/lib.rs

@@ -1,17 +1,7 @@
 //! Core cache interpreting utilities.
 
-#![feature(
-    lint_reasons,
-    error_generic_member_access,
-    error_iter,
-    cfg_eval,
-    try_blocks,
-    array_chunks,
-    if_let_guard,
-    let_chains,
-    error_in_core
-)]
-#![allow(clippy::result_large_err)]
+#![feature(error_generic_member_access, error_iter, cfg_eval, try_blocks, array_chunks, if_let_guard, let_chains)]
+#![allow(clippy::result_large_err, unexpected_cfgs)]
 #![warn(
     unused_qualifications,
     unused_import_braces,

rs3cache_backend/src/meta.rs

@@ -317,8 +317,6 @@ impl IndexMetadata {
         )
         .collect();
 
-        debug_assert!(!buffer.has_remaining());
-
         Ok(Self { metadatas })
     }
 

rs3cache_backend/src/xtea.rs

@@ -1,5 +1,3 @@
-#![cfg(feature = "dat2")]
-
 use std::{collections::HashMap, fs::File, io::BufReader, path::Path};
 
 use ::error::Context;

rs3cache_utils/src/lib.rs

@@ -1,6 +1,5 @@
 //! Miscellanious utilities.
 #![forbid(unsafe_code)]
-#![feature(lint_reasons)]
 #![warn(
     unused_crate_dependencies,
     unused_imports,

rust-toolchain.toml

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

rustfmt.toml

@@ -43,8 +43,7 @@ trailing_comma = "Vertical"
 match_block_trailing_comma = false
 blank_lines_upper_bound = 1
 blank_lines_lower_bound = 0
-edition = "2018"
-version = "One"
+edition = "2021"
 inline_attribute_width = 0
 merge_derives = true
 use_try_shorthand = false
@@ -55,7 +54,6 @@ color = "Auto"
 unstable_features = false
 disable_all_formatting = false
 skip_children = false
-hide_parse_errors = false
 error_on_line_overflow = false
 error_on_unformatted = false
 ignore = []

src/definitions/mapsquares/legacy.rs

@@ -52,7 +52,6 @@ impl Iterator for MapSquareIterator {
 impl ExactSizeIterator for MapSquareIterator {}
 
 /// Iterates over [`GroupMapSquare`] in arbitrary order.
-
 pub struct GroupMapSquareIterator {
     inner: CacheIndex<index::Initial>,
     range_i: RangeInclusive<i32>,

src/definitions/mapsquares/osrs.rs

@@ -95,7 +95,6 @@ impl Iterator for MapSquareIterator {
 impl ExactSizeIterator for MapSquareIterator {}
 
 /// Iterates over [`GroupMapSquare`] in arbitrary order.
-
 pub struct GroupMapSquareIterator {
     inner: CacheIndex<index::Initial>,
     range_i: RangeInclusive<i32>,

src/definitions/mapsquares/rs3.rs

@@ -46,7 +46,6 @@ impl Iterator for MapSquareIterator {
 impl ExactSizeIterator for MapSquareIterator {}
 
 /// Iterates over [`GroupMapSquare`] in arbitrary order.
-
 pub struct GroupMapSquareIterator {
     index: CacheIndex<index::Initial>,
     range_i: RangeInclusive<i32>,

src/definitions/sprites.rs

@@ -200,7 +200,6 @@ pub fn get_mapscenes(scale: u32, config: &crate::cli::Config) -> CacheResult<BTr
 /// # Panics
 ///
 /// **Panics** if `scale == 0`.
-
 pub fn dumps(scale: u32, ids: Vec<u32>, config: &crate::cli::Config) -> CacheResult<BTreeMap<(u32, u32), Sprite>> {
     assert_ne!(scale, 0);
 

src/definitions/textures.rs

@@ -1,5 +1,3 @@
-#![cfg(feature = "osrs")]
-
 use std::{
     collections::HashMap,
     fs::{self, File},

src/ffi/python/mapsquares.rs

@@ -165,7 +165,7 @@ impl PyMapSquare {
                 })
                 .context(error::Integrity)?
         } else {
-            locations.ok_or(rs3cache_backend::error::CacheError::Xtea { i: self.i(), j: self.j() })?
+            locations.ok_or(error::CacheError::Xtea { i: self.i(), j: self.j() })?
         };
 
         #[cfg(feature = "legacy")]

src/lib.rs

@@ -1,5 +1,5 @@
 #![doc = include_str!("../README.md")]
-#![feature(cfg_eval, doc_cfg, doc_auto_cfg, option_get_or_insert_default, lazy_cell, try_blocks, yeet_expr)]
+#![feature(cfg_eval, doc_cfg, doc_auto_cfg, try_blocks, yeet_expr)]
 #![allow(clippy::too_many_arguments, clippy::type_complexity)]
 #![warn(
     unused_qualifications,

src/renderers/map.rs

@@ -306,7 +306,7 @@ pub fn save_smallest(config: &Config, name: &str, i: u8, j: u8, imgs: [Img; 4])
 #[doc(hidden)]
 #[cfg(feature = "rs3")]
 pub fn render_bench() -> CacheResult<()> {
-    let config = crate::cli::Config::default();
+    let config = Config::default();
     let path = "test_data/tiles";
     fs::create_dir_all(path).unwrap();
     let coordinates: Vec<(u8, u8)> = iproduct!(45..55, 45..55).collect();

src/renderers/map/base.rs

@@ -102,7 +102,7 @@ pub fn put(
                                     120 => (6, 4, 4),
                                     121 | 122 => (87, 70, 62),
                                     125 | 126 => (50, 44, 36),
-                                    unknown => unimplemented!("unimplemented texture id {}", unknown),
+                                    unknown => (78, 95, 129), // unimplemented!("unimplemented texture id {}", unknown),
                                 };
                                 let fill = Rgba([red, green, blue, 255]);