Merge branch 'main' into fix_fr_loading

.github/workflows/validation-rust.yaml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@beta
         with:
           components: clippy
       - uses: Swatinem/rust-cache@v2

zspell-cli/src/download.rs

@@ -113,6 +113,7 @@ fn open_new_file(path: &Path, overwrite: bool) -> anyhow::Result<File> {
             .write(true)
             .read(true)
             .create(true)
+            .truncate(true)
             .open(path)
             .context(format!("unable to open '{fname}' in '{dir}'"))
     } else {

zspell/benches/datastructure.rs

@@ -2,6 +2,7 @@
 //! might use in our spellchecker
 
 #![allow(clippy::disallowed_types)]
+#![allow(clippy::incompatible_msrv)]
 
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::fs::File;

zspell/benches/dict_integration.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::incompatible_msrv)]
+
 use std::fs;
 use std::hint::black_box;
 

zspell/benches/slice_contains.rs

@@ -1,5 +1,7 @@
 //! Benchmark the difference between contains & `binary_search`es, intended
 
+#![allow(clippy::incompatible_msrv)]
+
 use std::hint::black_box;
 
 use criterion::{criterion_group, criterion_main, Criterion};

zspell/benches/small_map.rs

@@ -16,6 +16,7 @@
 //! situ (should only affect compile times)
 
 #![allow(clippy::disallowed_types)]
+#![allow(clippy::incompatible_msrv)]
 
 use std::collections::{BTreeMap, HashMap};
 use std::hint::black_box;

zspell/benches/word_splitter.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::incompatible_msrv)]
+
 use std::hint::black_box;
 
 use criterion::{criterion_group, criterion_main, Criterion};

zspell/build.rs

@@ -79,4 +79,5 @@ fn emit_autocfg() {
 
     // check if we have `Box<[T]>: From<&[T: Clone]>` loosened from `T: Copy` (1.71)
     ac.emit_expression_cfg(PROBE_BOX, "box_from_slice_has_clone_bound");
+    println!("cargo:rustc-check-cfg=cfg(box_from_slice_has_clone_bound)");
 }

zspell/src/dict.rs

@@ -303,7 +303,7 @@ impl Dictionary {
         let mut nosuggest = false;
 
         for flag in flags {
-            if self.affix_flags.get(flag).is_none() {
+            if !self.affix_flags.contains_key(flag) {
                 // FIXME: we get stuck on compound rules
                 continue;
             }

zspell/src/dict/meta.rs

@@ -55,7 +55,7 @@ pub enum Source {
         /// The full rule that created this
         rule: Arc<AfxRule>,
         /// Index of the relevant pattern within the rule. This could potentially be a reference
-        /// but that might require a RefCell, and I don't want to risk reference
+        /// but that might require a `RefCell`, and I don't want to risk reference
         pat_idx: usize,
     },
     /// This meta came from a .dic file, only contains morphinfo

zspell/src/dict/rule.rs

@@ -58,7 +58,9 @@ impl AfxRule {
             ret.patterns.push(AfxRulePattern {
                 affix: rule.affix.as_str().into(),
                 condition: rule.condition.clone(),
-                strip: rule.strip.as_ref().map(Arc::clone),
+                // FIXME: `rule.strip.as_ref().map(Arc::clone)` is more accurate, but flagged by
+                // clippy
+                strip: rule.strip.clone(),
                 morph_info,
             });
         }

zspell/test-util/src/lib.rs

@@ -1,5 +1,7 @@
 //! Utilities intended to help with test collection
+
 #![forbid(unsafe_code)]
+#![allow(clippy::assigning_clones)]
 
 use std::collections::BTreeMap;
 use std::fmt::Write;