* cleanup Cargo.toml

* exclude backend from windows build

* remove env include in windows build

* remove Backend from windows build

* fix compiler warning
This commit is contained in:
Ferdinand Schober
2023-02-17 14:40:40 +01:00
committed by GitHub
parent 90ad518ebe
commit deb1548e21
4 changed files with 9 additions and 12 deletions

10
Cargo.lock generated
View File

@@ -237,7 +237,6 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"tempfile", "tempfile",
"threadpool",
"toml", "toml",
"trust-dns-resolver", "trust-dns-resolver",
"wayland-client", "wayland-client",
@@ -632,15 +631,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "threadpool"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
dependencies = [
"num_cpus",
]
[[package]] [[package]]
name = "tinyvec" name = "tinyvec"
version = "1.6.0" version = "1.6.0"

View File

@@ -12,7 +12,6 @@ memmap = "0.7"
toml = "0.5" toml = "0.5"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
threadpool = "1.8"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
wayland-client = { version="0.30.0", optional = true } wayland-client = { version="0.30.0", optional = true }

View File

@@ -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}; use crate::{backend::consumer, client::{Client, ClientHandle}, event::Event};
#[cfg(unix)]
#[derive(Debug)] #[derive(Debug)]
enum Backend { enum Backend {
Wlroots, Wlroots,
@@ -11,6 +15,9 @@ enum Backend {
} }
pub fn start(consume_rx: Receiver<(Event, ClientHandle)>, clients: Vec<Client>, backend: Option<String>) -> JoinHandle<()> { pub fn start(consume_rx: Receiver<(Event, ClientHandle)>, clients: Vec<Client>, backend: Option<String>) -> JoinHandle<()> {
#[cfg(windows)]
let _backend = backend;
thread::Builder::new() thread::Builder::new()
.name("event consumer".into()) .name("event consumer".into())
.spawn(move || { .spawn(move || {

View File

@@ -6,6 +6,7 @@ use crate::{client::{Client, ClientHandle}, event::Event, request::Server};
use crate::backend::producer; use crate::backend::producer;
#[cfg(unix)]
enum Backend { enum Backend {
Wayland, Wayland,
X11, X11,