From fb0a4e731d1a417ab6d975b74444c06aed1a9a63 Mon Sep 17 00:00:00 2001 From: Nefo Fortressia Date: Fri, 12 Nov 2021 17:29:45 +0700 Subject: [PATCH 1/4] refactor: reexport components in components/mod.rs --- src/components/mod.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/mod.rs b/src/components/mod.rs index 6679c17..45dd3dc 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -6,3 +6,8 @@ pub mod app; pub mod editor; pub mod sidebar; pub mod window; + +pub use app::EchidnaEditor; +pub use editor::EchidnaCoreEditor; +pub use sidebar::EchidnaSidebar; +pub use window::EchidnaWindow; From 0c43be616e487642cb58e3b7c1d6999cd1758ba1 Mon Sep 17 00:00:00 2001 From: Nefo Fortressia Date: Fri, 12 Nov 2021 18:07:06 +0700 Subject: [PATCH 2/4] style: change the /lib prelude to import everything in closeable_tab --- src/lib/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/mod.rs b/src/lib/mod.rs index 233c324..07be95f 100644 --- a/src/lib/mod.rs +++ b/src/lib/mod.rs @@ -5,5 +5,5 @@ pub mod closeable_tab; pub mod prelude { - pub use super::closeable_tab::ClosableTabImplementedNotebook; + pub use super::closeable_tab::*; } From 8a9c414aeee490f81b246148f66dcdd96b445c42 Mon Sep 17 00:00:00 2001 From: Nefo Fortressia Date: Fri, 12 Nov 2021 17:31:46 +0700 Subject: [PATCH 3/4] refactor: reexport component preludes --- src/components/mod.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/mod.rs b/src/components/mod.rs index 45dd3dc..1cd3fdb 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -11,3 +11,7 @@ pub use app::EchidnaEditor; pub use editor::EchidnaCoreEditor; pub use sidebar::EchidnaSidebar; pub use window::EchidnaWindow; + +pub mod prelude { + pub use super::window::{file::*, menubar::*}; +} From 64b63cf41677d7f8021dc7871e5a018ce9072ac3 Mon Sep 17 00:00:00 2001 From: Nefo Fortressia Date: Fri, 12 Nov 2021 17:33:40 +0700 Subject: [PATCH 4/4] refactor: reexport all preludes to the crate --- src/main.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main.rs b/src/main.rs index 7e257d6..f8015f9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,3 +13,8 @@ fn main() { std::process::exit(app.run()); } + +pub mod prelude { + pub use super::components::prelude::*; + pub use super::lib::prelude::*; +}