From 81a49e82900893e7a987417d8dda9785311e3629 Mon Sep 17 00:00:00 2001 From: Janis Date: Tue, 30 Nov 2021 15:47:42 +0100 Subject: [PATCH] seperated crate into lib and binary --- Cargo.toml | 4 ++++ src/lib.rs | 24 ++++++++++++++++++++++++ src/main.rs | 29 ++--------------------------- 3 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index 378db03..30b0998 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,10 @@ version = "0.2.0" authors = ["noonebtw "] edition = "2018" +[[bin]] +name = "nowm" +path = "src/main.rs" + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..2d197ac --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,24 @@ +pub mod backends; +pub mod clients; +pub mod state; +pub mod util; + +pub mod error { + use thiserror::Error; + + #[derive(Debug, Error)] + pub enum Error { + #[error("placeholder error for Result as Option")] + NonError, + #[error("Unknown Event")] + UnknownEvent, + #[error("Unhandled VirtualKeyCode")] + UnhandledVirtualKeyCode, + #[error(transparent)] + IoError(#[from] std::io::Error), + #[error(transparent)] + FmtError(#[from] std::fmt::Error), + #[error(transparent)] + XlibError(#[from] crate::backends::xlib::XlibError), + } +} diff --git a/src/main.rs b/src/main.rs index 71025a7..2310770 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,32 +7,8 @@ use log4rs::{ encode::pattern::PatternEncoder, Config, }; -use state::WMConfig; -mod backends; -mod clients; -mod state; -mod util; - -pub mod error { - use thiserror::Error; - - #[derive(Debug, Error)] - pub enum Error { - #[error("placeholder error for Result as Option")] - NonError, - #[error("Unknown Event")] - UnknownEvent, - #[error("Unhandled VirtualKeyCode")] - UnhandledVirtualKeyCode, - #[error(transparent)] - IoError(#[from] std::io::Error), - #[error(transparent)] - FmtError(#[from] std::fmt::Error), - #[error(transparent)] - XlibError(#[from] crate::backends::xlib::XlibError), - } -} +use wm::state::WMConfig; fn init_logger() { let encoder = Box::new(PatternEncoder::new( @@ -83,7 +59,7 @@ fn main() { WMConfig::default() }); - state::WindowManager::::new(config).run(); + wm::state::WindowManager::::new(config).run(); } fn log_prologue() { @@ -102,7 +78,6 @@ fn log_prologue() { #[test] fn test_logger() { init_logger(); - // asdf log_prologue(); }