Skip to content

Commit 6782d64

Browse files
committed
fix: Make examples compile
1 parent 2d97e07 commit 6782d64

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

examples/daemon.rs

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
1-
use std::{env, io};
2-
use system76_keyboard_configurator::backend::{Daemon, DaemonClient, DaemonServer};
3-
4-
fn daemon_server() -> Result<DaemonServer<io::Stdin, io::Stdout>, String> {
5-
DaemonServer::new(io::stdin(), io::stdout())
6-
}
1+
use std::env;
2+
use system76_keyboard_configurator::backend::{run_daemon, Backend};
73

84
#[cfg(target_os = "linux")]
9-
fn with_daemon<F: Fn(Box<dyn Daemon>)>(f: F) {
5+
fn with_daemon<F: Fn(Backend)>(f: F) {
106
if unsafe { libc::geteuid() == 0 } {
117
eprintln!("Already running as root");
12-
let server = daemon_server().expect("Failed to create server");
13-
f(Box::new(server));
8+
let server = Backend::new().expect("Failed to create server");
9+
f(server);
1410
return;
1511
}
1612

17-
f(Box::new(DaemonClient::new_pkexec()));
13+
f(Backend::new_pkexec().unwrap());
1814
}
1915

2016
#[cfg(not(target_os = "linux"))]
2117
fn with_daemon<F: Fn(Box<dyn Daemon>)>(f: F) {
22-
let server = daemon_server().expect("Failed to create server");
23-
f(Box::new(server));
18+
let server = Backend::new().expect("Failed to create server");
19+
f(server);
2420
}
2521

2622
fn main() {
2723
for arg in env::args().skip(1) {
2824
if arg.as_str() == "--daemon" {
29-
let server = daemon_server().expect("Failed to create server");
30-
server.run().expect("Failed to run server");
31-
return;
25+
run_daemon()
3226
}
3327
}
3428

35-
with_daemon(|daemon| {
36-
println!("boards: {:?}", daemon.boards());
29+
with_daemon(|_daemon| {
30+
// println!("boards: {:?}", daemon.boards());
3731
});
3832
}

0 commit comments

Comments
 (0)