diff --git a/src/database/mod.rs b/src/database/mod.rs index 0e79ed6..705843c 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -1,23 +1,9 @@ -use crate::internal::rpc::Package; -use crate::Options; - mod add; mod initialise; mod query; mod remove; -pub fn add(a: Package, options: Options) { - add::add(a, options); -} - -pub fn remove(a: &str, options: Options) { - remove::remove(a, options); -} - -pub fn init(options: Options) { - initialise::init(options); -} - -pub fn query(options: Options) -> Vec { - query::query(options) -} +pub use add::*; +pub use initialise::*; +pub use query::*; +pub use remove::*; diff --git a/src/internal/mod.rs b/src/internal/mod.rs index 06c7006..04b9645 100644 --- a/src/internal/mod.rs +++ b/src/internal/mod.rs @@ -1,5 +1,3 @@ -use crate::Options; - mod clean; mod initialise; pub mod rpc; @@ -7,33 +5,10 @@ mod sort; mod strings; pub mod structs; -pub fn sort(a: &[String], options: Options) -> structs::Sorted { - sort::sort(a, options) -} - -pub fn clean(a: &[String], options: Options) -> Vec { - clean::clean(a, options) -} - -pub fn init(options: Options) { - initialise::init(options); -} - -pub fn info(a: String) { - strings::info(a); -} - -pub fn crash(a: String, b: i32) { - strings::crash(a, b); -} - -pub fn log(a: String) { - strings::log(a); -} - -pub fn prompt(a: String, b: bool) -> bool { - strings::prompt(a, b) -} +pub use clean::*; +pub use initialise::*; +pub use sort::*; +pub use strings::*; #[macro_export] macro_rules! uwu { diff --git a/src/operations/mod.rs b/src/operations/mod.rs index cb6f241..7782641 100644 --- a/src/operations/mod.rs +++ b/src/operations/mod.rs @@ -1,31 +1,11 @@ -use crate::Options; - mod aur_install; mod install; mod search; mod uninstall; mod upgrade; -pub fn install(a: Vec, options: Options) { - install::install(a, options); -} - -pub fn uninstall(a: Vec, options: Options) { - uninstall::uninstall(a, options); -} - -pub fn search(a: &str, options: Options) { - search::repo_search(a, options); -} - -pub fn aur_install(a: Vec, options: Options) { - aur_install::aur_install(a, options); -} - -pub fn aur_search(a: &str, options: Options) { - search::aur_search(a, options); -} - -pub fn upgrade(options: Options) { - upgrade::upgrade(options); -} +pub use aur_install::*; +pub use install::*; +pub use search::{aur_search, repo_search as search}; +pub use uninstall::*; +pub use upgrade::*;