From deb1548e21d00572d28ea12883ee1655622ab904 Mon Sep 17 00:00:00 2001 From: Ferdinand Schober Date: Fri, 17 Feb 2023 14:40:40 +0100 Subject: [PATCH] cleanup * cleanup Cargo.toml * exclude backend from windows build * remove env include in windows build * remove Backend from windows build * fix compiler warning --- Cargo.lock | 10 ---------- Cargo.toml | 1 - src/consumer.rs | 9 ++++++++- src/producer.rs | 1 + 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 87d4570..7374180 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -237,7 +237,6 @@ dependencies = [ "serde", "serde_derive", "tempfile", - "threadpool", "toml", "trust-dns-resolver", "wayland-client", @@ -632,15 +631,6 @@ dependencies = [ "syn", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "tinyvec" version = "1.6.0" diff --git a/Cargo.toml b/Cargo.toml index d3aab63..a294619 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,6 @@ memmap = "0.7" toml = "0.5" serde = "1.0" serde_derive = "1.0" -threadpool = "1.8" [target.'cfg(unix)'.dependencies] wayland-client = { version="0.30.0", optional = true } diff --git a/src/consumer.rs b/src/consumer.rs index cfa5e40..92a3ac5 100644 --- a/src/consumer.rs +++ b/src/consumer.rs @@ -1,7 +1,11 @@ -use std::{thread::{JoinHandle, self}, env, sync::mpsc::Receiver}; +use std::{thread::{JoinHandle, self}, sync::mpsc::Receiver}; + +#[cfg(unix)] +use std::env; use crate::{backend::consumer, client::{Client, ClientHandle}, event::Event}; +#[cfg(unix)] #[derive(Debug)] enum Backend { Wlroots, @@ -11,6 +15,9 @@ enum Backend { } pub fn start(consume_rx: Receiver<(Event, ClientHandle)>, clients: Vec, backend: Option) -> JoinHandle<()> { + #[cfg(windows)] + let _backend = backend; + thread::Builder::new() .name("event consumer".into()) .spawn(move || { diff --git a/src/producer.rs b/src/producer.rs index a75cfbf..3c3aadd 100644 --- a/src/producer.rs +++ b/src/producer.rs @@ -6,6 +6,7 @@ use crate::{client::{Client, ClientHandle}, event::Event, request::Server}; use crate::backend::producer; +#[cfg(unix)] enum Backend { Wayland, X11,