Shorten the heliport-model imports

build.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 
 use anyhow::Result;
 
-use heliport_model::languagemodel::binarize;
+use heliport_model::binarize;
 
 fn main() -> Result<()> {
     let mut model_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));

heliport-model/src/lib.rs

@@ -1,2 +1,5 @@
 pub mod languagemodel;
 pub mod lang;
+
+pub use crate::languagemodel::{Model, ModelNgram, OrderNgram, binarize};
+pub use crate::lang::{Lang, LangScores, LangBitmap};

src/cli/binarize.rs

@@ -5,7 +5,7 @@ use clap::Args;
 use log::{error, warn};
 use pyo3::prelude::*;
 
-use heliport_model::languagemodel::{binarize, OrderNgram};
+use heliport_model::{binarize, OrderNgram};
 use crate::utils::Abort;
 use crate::python::module_path;
 

src/cli/identify.rs

@@ -9,7 +9,7 @@ use itertools::Itertools;
 use log::{debug};
 use pyo3::prelude::*;
 
-use heliport_model::lang::Lang;
+use heliport_model::Lang;
 use crate::identifier::Identifier;
 use crate::utils::Abort;
 use crate::python::module_path;

src/identifier.rs

@@ -14,8 +14,8 @@ use rayon::prelude::*;
 #[cfg(feature = "python")]
 use pyo3::pyclass;
 
-use heliport_model::languagemodel::Model;
-use heliport_model::lang::{Lang, LangScores, LangBitmap};
+use heliport_model::Model;
+use heliport_model::{Lang, LangScores, LangBitmap};
 use crate::utils::is_cjk_block;
 
 lazy_static! {