diff --git a/crates/ewwii/src/display_backend.rs b/crates/ewwii/src/display_backend.rs index bb3a10e..d92a285 100644 --- a/crates/ewwii/src/display_backend.rs +++ b/crates/ewwii/src/display_backend.rs @@ -20,21 +20,21 @@ pub trait DisplayBackend: Send + Sync + 'static { ) -> Option; } -pub struct NoBackend; +// pub struct NoBackend; -impl DisplayBackend for NoBackend { - const IS_X11: bool = false; - const IS_WAYLAND: bool = false; +// impl DisplayBackend for NoBackend { +// const IS_X11: bool = false; +// const IS_WAYLAND: bool = false; - fn initialize_window( - _window_init: &WindowInitiator, - _monitor: gdk::Rectangle, - x: i32, - y: i32, - ) -> Option { - Some(Window::new(gtk::WindowType::Toplevel, x, y)) - } -} +// fn initialize_window( +// _window_init: &WindowInitiator, +// _monitor: gdk::Rectangle, +// x: i32, +// y: i32, +// ) -> Option { +// Some(Window::new(gtk::WindowType::Toplevel, x, y)) +// } +// } #[cfg(feature = "wayland")] mod platform_wayland { diff --git a/crates/ewwii/src/file_database.rs b/crates/ewwii/src/file_database.rs index 1b09ea5..b63a285 100644 --- a/crates/ewwii/src/file_database.rs +++ b/crates/ewwii/src/file_database.rs @@ -10,17 +10,17 @@ pub struct FileDatabase { latest_id: usize, } -#[derive(thiserror::Error, Debug)] -pub enum FilesError { - #[error(transparent)] - IoError(#[from] std::io::Error), +// #[derive(thiserror::Error, Debug)] +// pub enum FilesError { +// #[error(transparent)] +// IoError(#[from] std::io::Error), - #[error(transparent)] - DiagError(#[from] DiagError), +// #[error(transparent)] +// DiagError(#[from] DiagError), - #[error(transparent)] - ParserError(#[from] anyhow::Error), -} +// #[error(transparent)] +// ParserError(#[from] anyhow::Error), +// } impl FileDatabase { pub fn new() -> Self { diff --git a/crates/ewwii/src/geometry.rs b/crates/ewwii/src/geometry.rs deleted file mode 100644 index efe6352..0000000 --- a/crates/ewwii/src/geometry.rs +++ /dev/null @@ -1,10 +0,0 @@ -use derive_more::{Debug, *}; - -#[derive(Debug, Copy, Clone, Eq, PartialEq, Display)] -#[display(".x*.y:.width*.height")] -pub struct Rect { - pub x: i32, - pub y: i32, - pub width: i32, - pub height: i32, -} diff --git a/crates/ewwii/src/main.rs b/crates/ewwii/src/main.rs index 6d1fbbe..b36d239 100644 --- a/crates/ewwii/src/main.rs +++ b/crates/ewwii/src/main.rs @@ -3,7 +3,7 @@ This file mostly contains wayland/x11 setup and args stuff If you are interesting in something like window rendering, - then you can read `app.rs`. It is like the heart of ewwii. + then you can read `app.rs`. It is where daemon commands are handled. The full options (arguments) are parsed in `opts.rs` as well as `app.rs`. @@ -45,7 +45,6 @@ mod dynval; mod error_handling_ctx; mod file_database; mod gen_diagnostic_macro; -mod geometry; mod ipc_server; mod opts; mod paths; diff --git a/crates/iirhai/src/parser.rs b/crates/iirhai/src/parser.rs index 3bbb787..ee34c89 100644 --- a/crates/iirhai/src/parser.rs +++ b/crates/iirhai/src/parser.rs @@ -68,7 +68,7 @@ impl ParseConfig { .map_err(|e| anyhow!("Failed to read {:?}: {}", file_path.as_ref(), e))?) } - pub fn initial_poll_listen_scope(code: &str) -> Result { + pub fn initial_poll_listen_scope(code: &str) -> Result> { // Setting the initial value of poll/listen let mut scope = Scope::new(); for (var, initial) in extract_poll_and_listen_vars(code)? { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 31d61a3..0186aac 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,5 @@ [toolchain] -channel = "1.81.0" +# channel = "1.81.0" +channel = "1.89.0" components = [ "rust-src" ] profile = "default"