small fix

python/src/projection.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2023 Works Applications Co., Ltd.
+ *  Copyright (c) 2023-2024 Works Applications Co., Ltd.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -112,9 +112,8 @@ impl MorphemeProjection for NormalizedNouns {
 }
 
 fn conjugating_matcher<D: DictionaryAccess>(dic: &D) -> PosMatcher {
-    make_matcher(dic, |pos| match pos[0].deref() {
-        "動詞" | "形容詞" | "助動詞" => true,
-        _ => false,
+    make_matcher(dic, |pos| {
+        matches!(pos[0].deref(), "動詞" | "形容詞" | "助動詞")
     })
 }
 

sudachi/src/config.rs

@@ -100,9 +100,8 @@ impl PathResolver {
     }
 }
 
-#[derive(Deserialize, Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Deserialize, Clone, Copy, Debug, Eq, PartialEq, Default)]
 #[serde(rename_all = "snake_case")]
-#[derive(Default)]
 pub enum SurfaceProjection {
     #[default]
     Surface,

sudachi/src/dic/build/mod.rs

@@ -305,7 +305,7 @@ impl<D: DictionaryAccess> DictBuilder<D> {
     }
 
     /// this function must only be used in resolve_impl
-    fn unsafe_make_resolver<'b>(&self) -> RawDictResolver<'b> {
+    fn unsafe_make_resolver<'a>(&self) -> RawDictResolver<'a> {
         let resolver = RawDictResolver::new(self.lexicon.entries(), self.user);
         // resolver borrows parts of entries, but it does not touch splits
         // resolve function only modifies splits

sudachi/src/plugin/input_text/default_input_text/mod.rs

@@ -236,10 +236,9 @@ impl DefaultInputTextPlugin {
         ch: char,
     ) {
         if let Some(ch2) = data.next() {
-            if ch2 == ch {
-                return;
+            if ch2 != ch {
+                replacer.replace_char_iter(start..start + len, ch2, data)
             }
-            replacer.replace_char_iter(start..start + len, ch2, data)
         }
     }
 }

sudachi/src/plugin/oov/mecab_oov/mod.rs

@@ -131,7 +131,10 @@ impl MeCabOovPlugin {
 
             let cols: Vec<_> = line.split(',').collect();
             if cols.len() < 10 {
-                return Err(SudachiError::InvalidDataFormat(i, line.to_string()));
+                return Err(SudachiError::InvalidDataFormat(
+                    i,
+                    format!("Invalid number of columns ({})", line),
+                ));
             }
             let category_type: CategoryType = cols[0].parse()?;
             if !categories.contains_key(&category_type) {

sudachi/src/plugin/oov/mecab_oov/test.rs

@@ -437,7 +437,7 @@ fn read_oov_with_too_few_columns() {
         &mut grammar,
         UserPosMode::Forbid,
     );
-    assert_matches!(result, Err(SudachiError::InvalidDataFormat(0, s)) if s == data);
+    assert_matches!(result, Err(SudachiError::InvalidDataFormat(0, s)) if s.contains(data));
 }
 
 #[test]

sudachi/src/plugin/oov/regex_oov/mod.rs

@@ -44,9 +44,8 @@ pub(crate) struct RegexOovProvider {
     boundaries: BoundaryMode,
 }
 
-#[derive(Deserialize, Eq, PartialEq, Debug, Copy, Clone)]
+#[derive(Deserialize, Eq, PartialEq, Debug, Copy, Clone, Default)]
 #[serde(rename_all = "lowercase")]
-#[derive(Default)]
 pub enum BoundaryMode {
     #[default]
     Strict,

sudachi/src/plugin/path_rewrite/join_numeric/numeric_parser/mod.rs

@@ -27,7 +27,7 @@ pub enum Error {
     None,
     Point,
     Comma,
-    // OTHER,
+    // Other,
 }
 
 /// Parses number written by arabic or kanji

sudachi/src/util/user_pos.rs

@@ -20,13 +20,12 @@ use itertools::Itertools;
 use serde::Deserialize;
 use std::fmt::Display;
 
-#[derive(Eq, PartialEq, Deserialize, Clone, Copy, Debug)]
+#[derive(Eq, PartialEq, Deserialize, Clone, Copy, Debug, Default)]
 #[serde(rename_all = "lowercase")]
-#[derive(Default)]
 pub enum UserPosMode {
-    Allow,
     #[default]
     Forbid,
+    Allow,
 }
 
 pub trait UserPosSupport {