fix: compilation errors

Fix compilation errors due to nom update. Also fix some clippy warning.
Dalvany · Feb 18, 2025 · c0c81de · c0c81de
1 parent f5b0667
commit c0c81de
Show file tree

Hide file tree

Showing 74 changed files with 94 additions and 4,042 deletions.
diff --git a/src/beider_morse/engine.rs b/src/beider_morse/engine.rs
@@ -8,7 +8,7 @@ use crate::beider_morse::rule::{Phoneme, PhonemeList, PrivateRuleType, Rule, Rul
 use crate::helper::CharSequence;
 use crate::NameType;
 
-lazy_static! {
+lazy_static::lazy_static! {
     static ref NAME_PREFIXES: BTreeMap<NameType, BTreeSet<&'static str>> = BTreeMap::from([
         (
             NameType::Ashkenazi,
@@ -261,7 +261,7 @@ impl PhoneticEngine<'_> {
             .iter()
             .map(|v| {
                 if self.name_type == NameType::Sephardic {
-                    v.split('\'').last().unwrap()
+                    v.split('\'').next_back().unwrap()
                 } else {
                     v
                 }
@@ -314,7 +314,7 @@ mod tests {
     use crate::beider_morse::DEFAULT_MAX_PHONEMES;
     use crate::{ConfigFiles, PhoneticError, RuleType};
 
-    lazy_static! {
+    lazy_static::lazy_static! {
         static ref DATA: [(&'static str, &'static str, NameType, RuleType, bool, usize); 8] = [
             (
                 "Renault",

diff --git a/src/beider_morse/lang.rs b/src/beider_morse/lang.rs
@@ -3,6 +3,7 @@ use std::fmt::{Display, Formatter};
 use std::path::Path;
 
 use enum_iterator::all;
+use nom::Parser;
 use regex::Regex;
 
 use crate::beider_morse::{LanguageSet, Languages};
@@ -105,19 +106,19 @@ fn parse_lang(
         // or multiline.
 
         // Try single line comment
-        if let Ok((rm, _)) = end_of_line()(remains) {
+        if let Ok((rm, _)) = end_of_line().parse(remains) {
             remains = rm;
             continue;
         }
 
         // Try multiline comment
-        if let Ok((rm, ln)) = multiline_comment()(remains) {
+        if let Ok((rm, ln)) = multiline_comment().parse(remains) {
             line_number += ln - 1;
             remains = rm;
             continue;
         }
 
-        if let Ok((rm, (pattern, langs, accept_on_match))) = lang()(remains) {
+        if let Ok((rm, (pattern, langs, accept_on_match))) = lang().parse(remains) {
             remains = rm;
 
             let pattern: Regex = Regex::new(pattern).map_err(|error| {

diff --git a/src/beider_morse/languages.rs b/src/beider_morse/languages.rs
@@ -2,6 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::fmt::{Display, Formatter};
 use std::path::PathBuf;
 
+use nom::Parser;
 use serde::{Deserialize, Serialize};
 
 use crate::beider_morse::NameType;
@@ -172,20 +173,20 @@ fn parse_liste(list: String) -> Result<BTreeSet<String>, PhoneticError> {
         // or multiline.
 
         // Try single line comment
-        if let Ok((rm, _)) = end_of_line()(remains) {
+        if let Ok((rm, _)) = end_of_line().parse(remains) {
             remains = rm;
             continue;
         }
 
         // Try multiline comment
-        if let Ok((rm, ln)) = multiline_comment()(remains) {
+        if let Ok((rm, ln)) = multiline_comment().parse(remains) {
             line_number += ln - 1;
             remains = rm;
             continue;
         }
 
         // Try language
-        if let Ok((rm, language)) = language()(remains) {
+        if let Ok((rm, language)) = language().parse(remains) {
             remains = rm;
             result.insert(language.to_string());
             continue;

diff --git a/src/beider_morse/mod.rs b/src/beider_morse/mod.rs
@@ -359,7 +359,7 @@ mod tests {
     #[cfg(feature = "embedded_bm")]
     use crate::beider_morse::rule::PrivateRuleType;
 
-    lazy_static! {
+    lazy_static::lazy_static! {
         static ref CONFIG_FILE: ConfigFiles =
             ConfigFiles::new(&PathBuf::from("./test_assets/cc-rules/")).unwrap();
     }

diff --git a/src/beider_morse/rule.rs b/src/beider_morse/rule.rs
@@ -6,6 +6,7 @@ use std::str::FromStr;
 
 use either::Either;
 use enum_iterator::{all, Sequence};
+use nom::Parser;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 
@@ -225,7 +226,7 @@ fn parse_rule(
         // Parrsing test from more probable to less probable.
         // Try quadruplet rule
         if let Ok((rm, (pattern, left_context, right_context, phoneme_expr))) =
-            quadruplet()(remains)
+            quadruplet().parse(remains)
         {
             remains = rm;
             let pattern_length_char = pattern.chars().count();
@@ -259,13 +260,13 @@ fn parse_rule(
         }
 
         // Try single line comment
-        if let Ok((rm, _)) = end_of_line()(remains) {
+        if let Ok((rm, _)) = end_of_line().parse(remains) {
             remains = rm;
             continue;
         }
 
         // Try includes file
-        if let Ok((rm, include_filename)) = include()(remains) {
+        if let Ok((rm, include_filename)) = include().parse(remains) {
             remains = rm;
             let rules = parse_rule(resolver, include_filename).map_err(|error| {
                 if let PhoneticError::BMError(error) = error.clone() {
@@ -284,7 +285,7 @@ fn parse_rule(
         }
 
         // Try multiline comment
-        if let Ok((rm, ln)) = multiline_comment()(remains) {
+        if let Ok((rm, ln)) = multiline_comment().parse(remains) {
             line_number += ln - 1;
             remains = rm;
             continue;

diff --git a/src/daitch_mokotoff.rs b/src/daitch_mokotoff.rs
@@ -16,6 +16,8 @@
  */
 use std::collections::BTreeMap;
 
+use nom::Parser;
+
 use crate::helper::is_vowel;
 use crate::{
     build_error, end_of_line, folding, multiline_comment, quadruplet, Encoder, PhoneticError,
@@ -473,7 +475,7 @@ impl<'a> DaitchMokotoffSoundexBuilder<'a> {
             // Parrsing test from more probable to less probable.
 
             // Try quadruplet rule
-            if let Ok((rm, quadruplet)) = quadruplet()(remains) {
+            if let Ok((rm, quadruplet)) = quadruplet().parse(remains) {
                 let rule = Rule::try_from(quadruplet)?;
                 // There's always at least one char, the regex ensures that.
                 let ch = rule.pattern.chars().next().unwrap();
@@ -483,20 +485,20 @@ impl<'a> DaitchMokotoffSoundexBuilder<'a> {
             }
 
             // Try folding rule
-            if let Ok((rm, (pattern, replacement))) = folding()(remains) {
+            if let Ok((rm, (pattern, replacement))) = folding().parse(remains) {
                 ascii_folding_rules.insert(pattern, replacement);
                 remains = rm;
                 continue;
             }
 
             // Try single line comment
-            if let Ok((rm, _)) = end_of_line()(remains) {
+            if let Ok((rm, _)) = end_of_line().parse(remains) {
                 remains = rm;
                 continue;
             }
 
             // Try multiline comment
-            if let Ok((rm, ln)) = multiline_comment()(remains) {
+            if let Ok((rm, ln)) = multiline_comment().parse(remains) {
                 line_number += ln;
                 remains = rm;
                 continue;

diff --git a/src/double_metaphone.rs b/src/double_metaphone.rs
@@ -1050,7 +1050,7 @@ mod tests {
      *
      * Massaged the test data in the array below.
      */
-    const FIXTURE: [(&str, &str); 547] = [
+    static FIXTURE: [(&str, &str); 547] = [
         ("Accosinly", "Occasionally"),
         ("Ciculer", "Circler"),
         ("Circue", "Circle"),
@@ -2228,7 +2228,7 @@ mod tests {
         );
     }
 
-    const TEST_DATA: [(&str, &str, &str); 1221] = [
+    static TEST_DATA: [(&str, &str, &str); 1221] = [
         ("ALLERTON", "ALRT", "ALRT"),
         ("Acton", "AKTN", "AKTN"),
         ("Adams", "ATMS", "ATMS"),

diff --git a/src/lib.rs b/src/lib.rs
@@ -48,9 +48,6 @@
     unused_qualifications
 )]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
-#[macro_use]
-extern crate lazy_static;
-
 use std::error::Error;
 use std::fmt;
 use std::fmt::{Display, Formatter};