Upgrade to Rust 2024 edition

Author: Systemcluster

.rustfmt.toml

@@ -1,4 +1,4 @@
-style_edition = "2021"
+style_edition = "2024"
 unstable_features = true
 
 blank_lines_lower_bound = 0

Cargo.toml

@@ -10,9 +10,9 @@ license = "BSD-2-Clause"
 homepage = "https://kitoken.dev"
 repository = "https://github.com/Systemcluster/kitoken"
 readme = "README.md"
-edition = "2021"
+edition = "2024"
 resolver = "2"
-rust-version = "1.82.0"
+rust-version = "1.86.0"
 include = [
     "Cargo.toml",
     "src/**/*",
@@ -59,7 +59,7 @@ all = [
 ]
 
 # Enables standard library features
-std = ["dep:thiserror", "orx-priority-queue/std", "memchr/std", "multiversion?/std"]
+std = ["thiserror/std", "orx-priority-queue/std", "memchr/std", "multiversion?/std"]
 
 # Enables serialization and deserialization
 serialization = ["dep:serde", "dep:postcard"]
@@ -105,9 +105,9 @@ unstable = []
 
 [dependencies]
 
-bstr = { version = "1.11", default-features = false, features = ["alloc"] }
+bstr = { version = "1.12", default-features = false, features = ["alloc"] }
 log = { version = "0.4" }
-fancy-regex = { version = "0.14", default-features = false }
+fancy-regex = { version = "0.16", default-features = false }
 regex-automata = { version = "0.4", default-features = false, features = [
     "alloc",
     "syntax",
@@ -124,21 +124,19 @@ regex-syntax = { version = "0.8", default-features = false, features = [
     "unicode-gencat",
     "unicode-case",
 ] }
-hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "inline-more", "allocator-api2"] }
-once_cell = { version = "1.20", default-features = false, features = ["alloc", "race"] }
-orx-priority-queue = { version = "1.4", default-features = false }
+hashbrown = { version = "0.16", default-features = false, features = ["default-hasher", "inline-more", "allocator-api2"] }
+once_cell = { version = "1.21", default-features = false, features = ["alloc", "race"] }
+orx-priority-queue = { version = "1.7", default-features = false }
 memchr = { version = "2.7", default-features = false, features = ["alloc"] }
 derive_more = { version = "2.0", default-features = false, features = ["deref", "deref_mut", "as_ref", "index", "index_mut"] }
-
-# optional dependencies for the std feature
-thiserror = { version = "1.0", optional = true }
+thiserror = { version = "2.0", default-features = false }
 
 # optional dependencies for the serialization feature
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true }
 postcard = { version = "1.1", default-features = false, features = ["alloc"], optional = true }
 
 # optional dependencies for the regex-onig feature
-onig = { version = "6.4", default-features = false, optional = true }
+onig = { version = "6.5", default-features = false, optional = true }
 
 # optional dependencies for the normalization-unicode feature
 unicode-normalization = { version = "0.1", optional = true }
@@ -170,9 +168,9 @@ kitoken = { path = ".", default-features = false, features = [
     "multiversion",
 ] }
 
-console = { version = "0.15", features = ["windows-console-colors"] }
+console = { version = "0.16", features = ["windows-console-colors"] }
 simple_logger = { version = "5.0" }
-criterion = { version = "0.5", default-features = false, features = ["cargo_bench_support"] }
+criterion = { version = "0.7", default-features = false, features = ["cargo_bench_support"] }
 
 
 [package.metadata.docs.rs]

packages/javascript/Cargo.toml

@@ -3,7 +3,7 @@
 name = "kitoken-javascript"
 description = "JavaScript bindings for Kitoken"
 version = "0.10.1"
-edition = "2021"
+edition = "2024"
 resolver = "2"
 publish = false
 workspace = "../.."
@@ -24,7 +24,7 @@ default = [
     "normalization",
 ]
 
-std = ["kitoken/std", "wasm-bindgen/std"]
+std = ["kitoken/std", "wasm-bindgen/std", "rlsf/std"]
 serialization = ["kitoken/serialization"]
 normalization = ["kitoken/normalization"]
 regex-unicode = ["kitoken/regex-unicode"]
@@ -39,8 +39,8 @@ inspect = []
 
 kitoken = { path = "../..", default-features = false, features = [] }
 
-log = { version = "0.4.25" }
-rlsf = { version = "0.2.1", features = ["std"] }
+log = { version = "0.4.27" }
+rlsf = { version = "0.2.1" }
 wasm-bindgen = { version = "0.2.100", default-features = false, features = ["spans", "strict-macro"] }
 serde-wasm-bindgen = { version = "0.6.5" }
 

packages/javascript/package.json

@@ -53,13 +53,13 @@
         "./dist/*"
     ],
     "scripts": {
-        "build:node": "wasm-pack build --release --no-pack --target nodejs --out-dir dist --out-name node --features convert,split,regex-perf,inspect -Zbuild-std=panic_abort,core,alloc,std && move-file dist/node.js dist/node.cjs",
-        "build:web": "wasm-pack build --release --no-pack --target web --out-dir dist --out-name web --features convert,inspect -Zbuild-std=panic_abort,core,alloc,std",
-        "build:bundler": "wasm-pack build --release --no-pack --target bundler --out-dir dist --out-name index --features convert,inspect -Zbuild-std=panic_abort,core,alloc,std",
-        "build:minimal": "wasm-pack build --release --no-pack --target bundler --out-dir dist --out-name minimal --features default -Zbuild-std=panic_abort,core,alloc,std",
-        "build:full": "wasm-pack build --release --no-pack --target bundler --out-dir dist --out-name full --features convert,split,regex-perf,inspect -Zbuild-std=panic_abort,core,alloc,std",
-        "build": "cross-env RUSTC_BOOTSTRAP=1 RUSTFLAGS=\"-Ctarget-feature=+crt-static,+sign-ext,+bulk-memory,+mutable-globals,+nontrapping-fptoint,+multivalue,+reference-types -Zwasm-c-abi=spec\" concurrently -m 1 'npm:build:node' 'npm:build:web' 'npm:build:bundler' 'npm:build:minimal' 'npm:build:full'",
-        "prepare": "cross-env RUSTC_BOOTSTRAP=1 RUSTFLAGS=\"-Ctarget-feature=+crt-static,+sign-ext,+bulk-memory,+mutable-globals,+nontrapping-fptoint,+multivalue,+reference-types -Zwasm-c-abi=spec\" concurrently -m 1 'npm:build:node' 'npm:build:web' 'npm:build:bundler' 'npm:build:minimal' 'npm:build:full'"
+        "build:node": "wasm-pack build --release --no-pack --target nodejs --out-dir dist --out-name node --features std,convert,split,regex-perf,inspect -Zbuild-std=panic_abort,core,alloc,std && move-file dist/node.js dist/node.cjs",
+        "build:web": "wasm-pack build --release --no-pack --target web --out-dir dist --out-name web --features std,convert,inspect -Zbuild-std=panic_abort,core,alloc,std",
+        "build:bundler": "wasm-pack build --release --no-pack --target bundler --out-dir dist --out-name index --features std,convert,inspect -Zbuild-std=panic_abort,core,alloc,std",
+        "build:minimal": "wasm-pack build --release --no-pack --target bundler --out-dir dist --out-name minimal --features std,default -Zbuild-std=panic_abort,core,alloc,std",
+        "build:full": "wasm-pack build --release --no-pack --target bundler --out-dir dist --out-name full --features std,convert,split,regex-perf,inspect -Zbuild-std=panic_abort,core,alloc,std",
+        "build": "cross-env RUSTC_BOOTSTRAP=1 RUSTFLAGS=\"-Ctarget-cpu=mvp -Ctarget-feature=+crt-static,+sign-ext,+bulk-memory,+nontrapping-fptoint,+multivalue,+reference-types -Zwasm-c-abi=spec\" concurrently -m 1 'npm:build:node' 'npm:build:web' 'npm:build:bundler' 'npm:build:minimal' 'npm:build:full'",
+        "prepare": "cross-env RUSTC_BOOTSTRAP=1 RUSTFLAGS=\"-Ctarget-cpu=mvp -Ctarget-feature=+crt-static,+sign-ext,+bulk-memory,+nontrapping-fptoint,+multivalue,+reference-types -Zwasm-c-abi=spec\" concurrently -m 1 'npm:build:node' 'npm:build:web' 'npm:build:bundler' 'npm:build:minimal' 'npm:build:full'"
     },
     "devDependencies": {
         "concurrently": "^9.1.0",

packages/javascript/src/lib.rs

@@ -1,4 +1,7 @@
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
+
+#[cfg(feature = "std")]
+extern crate std;
 
 #[cfg(all(target_arch = "wasm32", not(target_feature = "atomics")))]
 #[global_allocator]
@@ -8,10 +11,9 @@ static ALLOCATOR: rlsf::SmallGlobalTlsf = rlsf::SmallGlobalTlsf::new();
 extern crate alloc;
 
 use alloc::rc::Rc;
+use alloc::string::String;
 use alloc::vec::Vec;
 
-use core::fmt::{Debug, Display};
-
 use wasm_bindgen::prelude::*;
 
 use ::kitoken::Kitoken as Inner;
@@ -159,6 +161,6 @@ impl Kitoken {
 }
 
 #[inline(never)]
-fn convert_error(e: impl Display) -> JsValue {
+fn convert_error(e: impl core::fmt::Display) -> JsValue {
     JsValue::from_str(&format!("{}", e))
 }

packages/python/Cargo.toml

@@ -3,7 +3,7 @@
 name = "kitoken-python"
 description = "Python bindings for Kitoken"
 version = "0.10.1"
-edition = "2021"
+edition = "2024"
 resolver = "2"
 publish = false
 workspace = "../.."
@@ -20,17 +20,17 @@ crate-type = ["cdylib"]
 
 kitoken = { path = "../..", default-features = false, features = ["all"] }
 
-log = { version = "0.4.22" }
-pyo3 = { version = "0.23.5", features = [
+log = { version = "0.4.27" }
+pyo3 = { version = "0.24.2", features = [
     "abi3",
     "abi3-py310",
     "serde",
     "extension-module",
     "generate-import-lib",
 ] }
-pyo3-log = { version = "0.12.1" }
-serde-pyobject = { version = "0.6.0" }
+pyo3-log = { version = "0.12.4" }
+serde-pyobject = { version = "0.6.1" }
 
 [target.'cfg(any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64"))'.dependencies]
 
-mimalloc = { version = "0.1.43", features = ["local_dynamic_tls"] }
+mimalloc = { version = "0.1.44", features = ["local_dynamic_tls"] }

src/config.rs

@@ -68,11 +68,10 @@ pub struct Template {
 
 /// Errors returned when the configuration fails to validate.
 #[non_exhaustive]
-#[derive(Debug)]
-#[cfg_attr(feature = "std", derive(thiserror::Error))]
+#[derive(Debug, thiserror::Error)]
 pub enum ConfigurationError {
     /// The feature required for the configuration is not enabled.
-    #[cfg_attr(feature = "std", error("required feature not enabled: {0}"))]
+    #[error("required feature not enabled: {0}")]
     FeatureDisabled(String),
 }
 

src/config/decoding.rs

@@ -108,23 +108,23 @@ impl Decoding {
 
 #[inline(never)]
 fn decode_extend(text: &mut Vec<u8>, character: char, left: u32, right: u32, pad: bool) {
-    let mut buffer = core::iter::repeat(0).take(character.len_utf8()).collect::<Vec<_>>();
+    let mut buffer = core::iter::repeat_n(0, character.len_utf8()).collect::<Vec<_>>();
     character.encode_utf8(&mut buffer);
     if left > 0 {
         let mut left = left as usize;
         if pad {
             let leading = text.chars().take(left).take_while(|&c| c == character).count();
             left = left.saturating_sub(leading);
         }
-        text.splice(..0, core::iter::repeat(&buffer).take(left).flatten().copied());
+        text.splice(..0, core::iter::repeat_n(&buffer, left).flatten().copied());
     }
     if right > 0 {
         let mut right = right as usize;
         if pad {
             let trailing = text.chars().rev().take(right).take_while(|&c| c == character).count();
             right = right.saturating_sub(trailing);
         }
-        text.extend(core::iter::repeat(&buffer).take(right).flatten().copied());
+        text.extend(core::iter::repeat_n(&buffer, right).flatten().copied());
     }
 }
 
@@ -200,6 +200,7 @@ fn decode_replace(text: &mut Vec<u8>, pattern: &DecodingReplacePattern, replacem
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloc::borrow::ToOwned;
     use alloc::vec::Vec;
 
     #[test]

src/config/normalization.rs

@@ -236,7 +236,7 @@ fn normalize_prepend(text: &mut Cow<str>, prepend: &str) {
 
 #[inline(never)]
 fn normalize_extend(text: &mut Cow<str>, character: char, left: u32, right: u32, pad: bool) {
-    let mut buffer = core::iter::repeat(0).take(character.len_utf8()).collect::<Vec<_>>();
+    let mut buffer = core::iter::repeat_n(0, character.len_utf8()).collect::<Vec<_>>();
     character.encode_utf8(&mut buffer);
     if left > 0 {
         let mut left = left as usize;
@@ -247,7 +247,7 @@ fn normalize_extend(text: &mut Cow<str>, character: char, left: u32, right: u32,
         unsafe {
             text.to_mut()
                 .as_mut_vec()
-                .splice(..0, core::iter::repeat(&buffer).take(left).flatten().copied());
+                .splice(..0, core::iter::repeat_n(&buffer, left).flatten().copied());
         };
     }
     if right > 0 {
@@ -259,7 +259,7 @@ fn normalize_extend(text: &mut Cow<str>, character: char, left: u32, right: u32,
         unsafe {
             text.to_mut()
                 .as_mut_vec()
-                .extend(core::iter::repeat(&buffer).take(right).flatten().copied());
+                .extend(core::iter::repeat_n(&buffer, right).flatten().copied());
         };
     }
 }

src/config/processing.rs

@@ -129,7 +129,7 @@ fn process_pad(
         length - len
     };
     if amount > 0 {
-        let padding = core::iter::repeat(id).take(amount).collect::<Vec<_>>();
+        let padding = core::iter::repeat_n(id, amount).collect::<Vec<_>>();
         match direction {
             ProcessingDirection::Left => {
                 tokens.splice(0..0, padding);