From f846ec8837ea378a9da3fcc8731cf9467db3d2d6 Mon Sep 17 00:00:00 2001 From: Anna Date: Tue, 4 Sep 2018 14:44:23 -0400 Subject: [PATCH] refactor: reexport some items --- src/lib.rs | 4 ++++ src/logic.rs | 6 ++++++ src/logic/search.rs | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index eab0f0b..3fc7ee6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,6 +2,7 @@ #[cfg(feature = "logic")] #[macro_use] extern crate failure; #[cfg(feature = "logic")] #[macro_use] extern crate lazy_static; +pub extern crate ffxiv_types; #[macro_use] extern crate serde_derive; #[cfg(feature = "logic")] @@ -11,3 +12,6 @@ pub mod logic; pub mod models; crate mod util; + +#[cfg(feature = "logic")] +pub use crate::logic::*; diff --git a/src/logic.rs b/src/logic.rs index d8cf0d4..c60a5f5 100644 --- a/src/logic.rs +++ b/src/logic.rs @@ -26,6 +26,12 @@ pub mod character; pub mod free_company; pub mod search; +pub use self::{ + character::parse as parse_character, + free_company::parse as parse_free_company, + search::*, +}; + crate fn plain_parse(html: &Html, select: &scraper::Selector) -> Result { let string = html .select(select) diff --git a/src/logic/search.rs b/src/logic/search.rs index e0412df..ae53f14 100644 --- a/src/logic/search.rs +++ b/src/logic/search.rs @@ -8,6 +8,11 @@ use scraper::Html; pub mod character; pub mod free_company; +pub use self::{ + character::parse as parse_character_search, + free_company::parse as parse_free_company_search, +}; + selectors!( PAGINATION_TOTAL => ".parts__total"; PAGINATION_PAGES => ".btn__pager__current";