Merge pull request #145 from greyblake/rust-2024

Rust 2024

Author: greyblake

CHANGELOG.md

@@ -1,5 +1,8 @@
+### v0.18.0 - 2025-10-16
+* [BREAKING] Update to Rust edition 2024
+
 ### v0.17.0 - 2025-10-16
-* Support Welsh
+* [BREAKING] Support Welsh
 * Bump hashbrown to 15
 
 ### v0.16.4 - 2024-01-04

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "whatlang"
-version = "0.17.0"
+version = "0.18.0"
 authors = ["Serhii Potapov <blake131313@gmail.com>"]
-edition = "2021"
+edition = "2024"
 description = "Fast and lightweight language identification library for Rust."
 keywords = ["language", "nlp", "lang", "whatlang", "text"]
 license = "MIT"

benches/example.rs

@@ -4,7 +4,7 @@ extern crate bencher;
 use bencher::Bencher;
 use std::collections::HashMap;
 use whatlang::dev::{
-    alphabet_cyrillic_calculate_scores, alphabet_latin_calculate_scores, FilterList, LowercaseText,
+    FilterList, LowercaseText, alphabet_cyrillic_calculate_scores, alphabet_latin_calculate_scores,
 };
 use whatlang::{detect, detect_script};
 

src/alphabets/cyrillic.rs

@@ -1,5 +1,5 @@
-use super::common::{build_inverted_map, generic_alphabet_calculate_scores};
 use super::RawOutcome;
+use super::common::{build_inverted_map, generic_alphabet_calculate_scores};
 use crate::core::{FilterList, LowercaseText};
 use crate::{Lang, Script};
 use std::sync::LazyLock;

src/alphabets/detection.rs

@@ -1,7 +1,7 @@
 use super::RawOutcome;
 use super::{cyrillic, latin};
-use crate::core::{calculate_confidence, FilterList, Info, InternalQuery, LowercaseText};
 use crate::Lang;
+use crate::core::{FilterList, Info, InternalQuery, LowercaseText, calculate_confidence};
 
 pub fn detect(iquery: &InternalQuery) -> Option<Info> {
     let raw_outcome = raw_detect(iquery);

src/alphabets/latin.rs

@@ -1,7 +1,7 @@
 use std::sync::LazyLock;
 
-use super::common::{build_inverted_map, generic_alphabet_calculate_scores};
 use super::RawOutcome;
+use super::common::{build_inverted_map, generic_alphabet_calculate_scores};
 use crate::core::{FilterList, LowercaseText};
 use crate::{Lang, Script};
 
@@ -95,8 +95,8 @@ pub fn alphabet_calculate_scores(text: &LowercaseText, filter_list: &FilterList)
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::utils::is_stop_char;
     use crate::Script;
+    use crate::utils::is_stop_char;
 
     // Old naive implementation, that is not very effective but easy to understand
     fn naive_alphabet_calculate_scores(

src/combined/mod.rs

@@ -1,7 +1,7 @@
+use crate::Lang;
 use crate::alphabets;
-use crate::core::{calculate_confidence, Info, InternalQuery};
+use crate::core::{Info, InternalQuery, calculate_confidence};
 use crate::trigrams;
-use crate::Lang;
 
 #[derive(Debug)]
 pub struct RawOutcome {

src/core/detect.rs

@@ -1,9 +1,10 @@
+use crate::Lang;
 use crate::core::{Info, Method, Options, Query};
 use crate::scripts::{
+    RawScriptInfo, Script,
     grouping::{MultiLangScript, ScriptLangGroup},
-    raw_detect_script, RawScriptInfo, Script,
+    raw_detect_script,
 };
-use crate::Lang;
 use crate::{alphabets, combined, trigrams};
 
 /// Detect only a language by a given text.

src/core/detector.rs

@@ -1,9 +1,9 @@
+use crate::Lang;
 use crate::core;
 use crate::core::FilterList;
 use crate::core::Info;
 use crate::core::Options;
-use crate::scripts::{detect_script, Script};
-use crate::Lang;
+use crate::scripts::{Script, detect_script};
 
 /// Configurable structure that holds detection options and provides functions
 /// to detect language and script.

src/core/filter_list.rs

@@ -26,8 +26,8 @@ impl FilterList {
     pub fn is_allowed(&self, lang: Lang) -> bool {
         match self {
             Self::All => true,
-            Self::Allow(ref allowlist) => allowlist.contains(&lang),
-            Self::Deny(ref denylist) => !denylist.contains(&lang),
+            Self::Allow(allowlist) => allowlist.contains(&lang),
+            Self::Deny(denylist) => !denylist.contains(&lang),
         }
     }
 }