Update to 2021 edition

divvun · Dec 13, 2023 · ed5c5a0 · ed5c5a0
1 parent 278af8a
commit ed5c5a0
Show file tree

Hide file tree

Showing 11 changed files with 628 additions and 484 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "divvunspell",
   "accuracy",
@@ -12,4 +13,4 @@ opt-level = 1
 [profile.release]
 debug = true
 codegen-units = 1
-lto = "fat"
+lto = "fat"
diff --git a/README.md b/README.md
@@ -2,8 +2,7 @@
 
 An implementation of [hfst-ospell](https://github.com/hfst/hfst-ospell) in Rust, with added features like tokenization, case handling, and parallelisation.
 
-[![Actions Status](https://github.com/divvun/divvunspell/workflows/Continuous%20Integration/badge.svg)](https://github.com/divvun/divvunspell/actions)
-
+[![CI](https://github.com/divvun/divvunspell/actions/workflows/ci.yml/badge.svg)](https://github.com/divvun/divvunspell/actions/workflows/ci.yml)
 
 ## Building and installing commandline tools
 

diff --git a/accuracy/Cargo.toml b/accuracy/Cargo.toml
@@ -2,7 +2,7 @@
 name = "accuracy"
 version = "1.0.0-beta.1"
 authors = ["Brendan Molloy <brendan@bbqsrc.net>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 publish = false
 

diff --git a/accuracy/src/main.rs b/accuracy/src/main.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use distance::damerau_levenshtein;
-use divvunspell::archive::{SpellerArchive, ZipSpellerArchive, self};
+use divvunspell::archive;
 use divvunspell::speller::suggestion::Suggestion;
 use divvunspell::speller::{CaseHandlingConfig, SpellerConfig};
 use indicatif::{ParallelProgressIterator, ProgressBar, ProgressStyle};

diff --git a/divvunspell-bin/Cargo.toml b/divvunspell-bin/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "divvunspell-bin"
 description = "Spellchecker for ZHFST/BHFST spellers, with case handling and tokenization support."
-version = "1.0.0-beta.3"
+version = "1.0.0"
 authors = ["Brendan Molloy <brendan@bbqsrc.net>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 repository = "https://github.com/divvun/divvunspell"
 
@@ -23,4 +23,4 @@ structopt = "0.3.17"
 
 [features]
 default = []
-gpt2 = ["divvunspell/gpt2"]
+gpt2 = ["divvunspell/gpt2"]
diff --git a/divvunspell/Cargo.toml b/divvunspell/Cargo.toml
@@ -3,7 +3,7 @@ name = "divvunspell"
 description = "Spell checking library for ZHFST/BHFST spellers, with case handling and tokenization support."
 version = "1.0.0-beta.3"
 authors = ["Brendan Molloy <brendan@bbqsrc.net>"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/divvun/divvunspell"
 

diff --git a/divvunspell/examples/find-path.rs b/divvunspell/examples/find-path.rs
@@ -11,6 +11,6 @@ fn main() {
 
     match divvunspell::paths::find_speller_path(tag) {
         Some(v) => println!("Found: {}", v.display()),
-        None => println!("Not found!")
+        None => println!("Not found!"),
     }
-} 
+}
diff --git a/divvunspell/src/ffi/mod.rs b/divvunspell/src/ffi/mod.rs
@@ -36,12 +36,12 @@ pub extern "C" fn divvun_word_indices_next<'a>(
 
 #[no_mangle]
 pub extern "C" fn divvun_word_indices_free<'a>(handle: *mut WordIndices<'a>) {
-    unsafe { Box::from_raw(handle) };
+    drop(unsafe { Box::from_raw(handle) });
 }
 
 #[no_mangle]
 pub extern "C" fn divvun_cstr_free(handle: *mut c_char) {
-    unsafe { CString::from_raw(handle) };
+    drop(unsafe { CString::from_raw(handle) });
 }
 
 use crate::ffi::fbs::IntoFlatbuffer;

diff --git a/divvunspell/src/tokenizer/case_handling.rs b/divvunspell/src/tokenizer/case_handling.rs
@@ -187,7 +187,7 @@ mod tests {
 
     #[test]
     fn test() {
-        let a = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        let _a = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
             .chars()
             .map(|c| SmolStr::from(c.to_string()))
             .collect::<Vec<SmolStr>>();

diff --git a/thfst-tools/Cargo.toml b/thfst-tools/Cargo.toml
@@ -3,7 +3,7 @@ name = "thfst-tools"
 description = "Support tools for DivvunSpell - convert ZHFST files to BHFST."
 version = "1.0.0-beta.3"
 authors = ["Brendan Molloy <brendan@bbqsrc.net>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 repository = "https://github.com/divvun/divvunspell"
 
@@ -12,4 +12,4 @@ serde_json = "1.0.57"
 divvunspell = { version = "1.0.0-beta.3", features = ["internal_convert", "compression"], path = "../divvunspell" }
 box-format = "0.3.2"
 structopt = "0.3.17"
-tempfile = "3"
+tempfile = "3"