refactor: group imports

Author: kanru

src/conversion/chewing.rs

@@ -5,9 +5,8 @@ use std::{
 
 use tracing::trace;
 
-use super::{Composition, ConversionEngine, Gap, Interval, Symbol};
+use super::{Composition, ConversionEngine, Gap, Interval, Outcome, Symbol};
 use crate::{
-    conversion::Outcome,
     dictionary::{Dictionary, LookupStrategy, Phrase},
     zhuyin::Syllable,
 };

src/conversion/fuzzy.rs

@@ -1,5 +1,5 @@
-use super::{ChewingEngine, ConversionEngine};
-use crate::{conversion::Outcome, dictionary::LookupStrategy};
+use super::{ChewingEngine, ConversionEngine, Outcome};
+use crate::dictionary::LookupStrategy;
 
 /// Same conversion method as Chewing but uses fuzzy phrase search.
 #[derive(Debug, Default)]

src/conversion/mod.rs

@@ -1,10 +1,5 @@
 //! Algorithms to convert syllables to Chinese characters.
 
-mod chewing;
-mod fuzzy;
-mod simple;
-mod symbol;
-
 use std::{
     cmp::{max, min},
     fmt::Debug,
@@ -16,6 +11,11 @@ pub use self::simple::SimpleEngine;
 pub(crate) use self::symbol::{full_width_symbol_input, special_symbol_input};
 use crate::{dictionary::Dictionary, zhuyin::Syllable};
 
+mod chewing;
+mod fuzzy;
+mod simple;
+mod symbol;
+
 /// Converts a composition buffer to list of intervals.
 ///
 /// [`Composition`] contains all user inputs and selection information. The out

src/conversion/simple.rs

@@ -1,6 +1,5 @@
-use super::{Composition, ConversionEngine, Interval};
 use crate::{
-    conversion::Outcome,
+    conversion::{Composition, ConversionEngine, Interval, Outcome},
     dictionary::{Dictionary, LookupStrategy},
 };
 

src/dictionary/mod.rs

@@ -10,16 +10,15 @@ use std::{
     path::Path,
 };
 
-pub use layered::Layered;
-pub use loader::{
+pub use self::layered::Layered;
+pub use self::loader::{
     DEFAULT_DICT_NAMES, LoadDictionaryError, SingleDictionaryLoader, SystemDictionaryLoader,
     UserDictionaryLoader,
 };
 #[cfg(feature = "sqlite")]
-pub use sqlite::{SqliteDictionary, SqliteDictionaryBuilder, SqliteDictionaryError};
-pub use trie::{Trie, TrieBuilder, TrieOpenOptions, TrieStatistics};
-pub use trie_buf::TrieBuf;
-
+pub use self::sqlite::{SqliteDictionary, SqliteDictionaryBuilder, SqliteDictionaryError};
+pub use self::trie::{Trie, TrieBuilder, TrieOpenOptions, TrieStatistics};
+pub use self::trie_buf::TrieBuf;
 use crate::zhuyin::Syllable;
 
 mod layered;

src/editor/mod.rs

@@ -1,11 +1,5 @@
 //! Abstract input method editors.
 
-mod abbrev;
-mod composition_editor;
-mod estimate;
-mod selection;
-pub mod zhuyin_layout;
-
 use std::{
     any::Any,
     cmp::{max, min},
@@ -14,9 +8,9 @@ use std::{
     mem,
 };
 
-pub use estimate::{LaxUserFreqEstimate, UserFreqEstimate};
 use tracing::{debug, error, info, trace, warn};
 
+pub use self::estimate::{LaxUserFreqEstimate, UserFreqEstimate};
 pub use self::{abbrev::AbbrevTable, selection::symbol::SymbolSelector};
 use self::{
     composition_editor::CompositionEditor,
@@ -36,6 +30,12 @@ use crate::{
     zhuyin::Syllable,
 };
 
+mod abbrev;
+mod composition_editor;
+mod estimate;
+mod selection;
+pub mod zhuyin_layout;
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum LanguageMode {
     Chinese,
@@ -1545,14 +1545,13 @@ impl State for Highlighting {
 
 #[cfg(test)]
 mod tests {
-    use estimate::LaxUserFreqEstimate;
-
     use super::collect_new_phrases;
+    use super::estimate::LaxUserFreqEstimate;
     use super::{BasicEditor, Editor};
     use crate::{
         conversion::{ChewingEngine, Interval, Symbol},
         dictionary::{Layered, TrieBuf},
-        editor::{EditorKeyBehavior, EditorOptions, SymbolSelector, abbrev::AbbrevTable, estimate},
+        editor::{EditorKeyBehavior, EditorOptions, SymbolSelector, abbrev::AbbrevTable},
         input::{
             KeyboardEvent, keycode,
             keymap::{QWERTY_MAP, map_ascii},

src/input.rs

@@ -2,10 +2,8 @@
 
 use std::fmt::Display;
 
-use keycode::Keycode;
-use keysym::Keysym;
-
-use crate::input::keysym::SYM_NONE;
+use self::keycode::Keycode;
+use self::keysym::{Keysym, SYM_NONE};
 
 pub mod keycode;
 pub mod keymap;

src/input/keymap.rs

@@ -8,10 +8,10 @@
 //! It's recommended to use full featured library like xkbcommon to map keycode
 //! to keysyms.
 
-use crate::input::KeyState;
-use crate::input::KeyboardEvent;
-use crate::input::keycode::*;
-use crate::input::keysym::*;
+use super::KeyState;
+use super::KeyboardEvent;
+use super::keycode::*;
+use super::keysym::*;
 
 macro_rules! keymap {
     ($($k:expr => ($code:expr, $ksym:expr, $state:expr)),* $(,)?) => {{

src/zhuyin/bopomofo.rs

@@ -116,7 +116,7 @@ pub enum Bopomofo {
     TONE1,
 }
 
-use Bopomofo::*;
+use self::Bopomofo::*;
 
 const INITIAL_MAP: [Bopomofo; 21] = [
     B, P, M, F, D, T, N, L, G, K, H, J, Q, X, ZH, CH, SH, R, Z, C, S,

src/zhuyin/mod.rs

@@ -1,10 +1,10 @@
 //! Chinese syllables and bopomofo phonetic symbols.
 
-mod bopomofo;
-mod syllable;
-
-pub use bopomofo::{Bopomofo, BopomofoErrorKind, BopomofoKind, ParseBopomofoError};
-pub use syllable::{
+pub use self::bopomofo::{Bopomofo, BopomofoErrorKind, BopomofoKind, ParseBopomofoError};
+pub use self::syllable::{
     BuildSyllableError, DecodeSyllableError, ParseSyllableError, Syllable, SyllableBuilder,
     SyllableErrorKind,
 };
+
+mod bopomofo;
+mod syllable;