fix(fst-dict): remove duplication by importing types from parsing crate

Types include:
- Span
- CharString
- WordMetadata

harper-core/src/document.rs

@@ -7,9 +7,9 @@ use paste::paste;
 use crate::parsers::{Markdown, Parser, PlainEnglish};
 use crate::patterns::{PatternExt, RepeatingPattern, SequencePattern};
 use crate::punctuation::Punctuation;
-use crate::span::Span;
 use crate::token::NumberSuffix;
 use crate::vec_ext::VecExt;
+use crate::Span;
 use crate::{Dictionary, FatToken, FstDictionary, Lrc, Token, TokenKind, TokenStringExt};
 
 /// A document containing some amount of lexed and parsed English text.

harper-core/src/lib.rs

@@ -2,7 +2,6 @@
 #![allow(dead_code)]
 
 mod char_ext;
-mod char_string;
 mod document;
 pub mod language_detection;
 mod lexing;
@@ -11,21 +10,20 @@ mod mask;
 pub mod parsers;
 pub mod patterns;
 mod punctuation;
-mod span;
 mod spell;
 mod sync;
 mod token;
 mod vec_ext;
 
 use std::collections::VecDeque;
 
-pub use char_string::{CharString, CharStringExt};
 pub use document::Document;
+pub use harper_dictionary_parsing::char_string::{CharString, CharStringExt};
+pub use harper_dictionary_parsing::span::Span;
 pub use harper_dictionary_parsing::{word_metadata::Tense, WordMetadata};
 use linting::Lint;
 pub use mask::{Mask, Masker};
 pub use punctuation::{Punctuation, Quote};
-pub use span::Span;
 pub use spell::{Dictionary, FstDictionary, FullDictionary, MergedDictionary};
 pub use sync::Lrc;
 pub use token::{FatToken, Token, TokenKind, TokenStringExt};

harper-core/src/linting/lint.rs

@@ -3,7 +3,7 @@ use std::fmt::Display;
 use is_macro::Is;
 use serde::{Deserialize, Serialize};
 
-use crate::span::Span;
+use crate::Span;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Lint {

harper-core/src/spell/fst_dictionary.rs

@@ -1,12 +1,11 @@
 use super::{edit_distance_min_alloc, seq_to_normalized, FullDictionary};
 use fst::Map as FstMap;
 use fst::{automaton::Levenshtein, IntoStreamer};
-use harper_dictionary_parsing::CharString;
 use hashbrown::HashMap;
 use itertools::Itertools;
 use std::sync::Arc;
 
-use crate::{CharStringExt, WordMetadata};
+use crate::{CharString, CharStringExt, WordMetadata};
 
 use super::Dictionary;
 

harper-core/src/spell/merged_dictionary.rs

@@ -1,9 +1,8 @@
-use harper_dictionary_parsing::CharString;
 use itertools::Itertools;
 use std::sync::Arc;
 
 use super::dictionary::Dictionary;
-use crate::WordMetadata;
+use crate::{CharString, WordMetadata};
 
 /// A simple wrapper over [`Dictionary`] that allows
 /// one to merge multiple dictionaries without copying.

harper-core/src/spell/mod.rs

@@ -1,9 +1,8 @@
 use std::borrow::Cow;
 
-use harper_dictionary_parsing::WordMetadata;
 use itertools::{Itertools, MinMaxResult};
 
-use crate::{CharString, CharStringExt};
+use crate::{CharString, CharStringExt, WordMetadata};
 
 pub use self::dictionary::Dictionary;
 pub use self::fst_dictionary::FstDictionary;

harper-core/src/token.rs

@@ -5,7 +5,7 @@ use paste::paste;
 use serde::{Deserialize, Serialize};
 
 use crate::punctuation::Punctuation;
-use crate::span::Span;
+use crate::Span;
 use crate::{Quote, WordMetadata};
 use harper_dictionary_parsing::word_metadata::{ConjunctionData, NounData};
 

harper-dictionary-parsing/src/char_string.rs

@@ -3,3 +3,21 @@ use smallvec::SmallVec;
 /// A char sequence that improves cache locality.
 /// Most English words are fewer than 12 characters.
 pub type CharString = SmallVec<[char; 12]>;
+
+pub trait CharStringExt {
+    fn to_lower(&self) -> CharString;
+    fn to_string(&self) -> String;
+}
+
+impl CharStringExt for [char] {
+    fn to_lower(&self) -> CharString {
+        let mut out = CharString::with_capacity(self.len());
+
+        out.extend(self.iter().flat_map(|v| v.to_lowercase()));
+
+        out
+    }
+    fn to_string(&self) -> String {
+        self.iter().collect()
+    }
+}

harper-dictionary-parsing/src/lib.rs

@@ -4,13 +4,13 @@ pub mod char_string;
 mod error;
 mod expansion;
 mod matcher;
-mod span;
+pub mod span;
 pub mod word_list;
 pub mod word_metadata;
 
 pub use attribute_list::AttributeList;
 use attribute_list::HumanReadableAttributeList;
-pub use char_string::CharString;
+pub use char_string::{CharString, CharStringExt};
 pub use error::Error;
 pub use span::Span;
 pub use word_metadata::WordMetadata;