From 0ce10f2703c19267c2d82b2ecfbef789a216e100 Mon Sep 17 00:00:00 2001 From: MaxVerevkin Date: Sun, 23 Jul 2023 16:36:38 +0300 Subject: cargo update --- src/main.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 1b56800..e06b1f5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,10 +18,10 @@ mod wm_info_provider; use signal_hook::consts::*; -use std::{io::ErrorKind, os::fd::AsRawFd}; +use std::io::ErrorKind; +use std::os::unix::io::AsRawFd; -use wayrs_client::connection::Connection; -use wayrs_client::IoMode; +use wayrs_client::{Connection, IoMode}; use nix::{ errno::Errno, @@ -35,8 +35,7 @@ fn main() -> anyhow::Result<()> { let (sig_read, sig_write) = nix::unistd::pipe2(OFlag::O_NONBLOCK | OFlag::O_CLOEXEC)?; signal_hook::low_level::pipe::register(SIGUSR1, sig_write)?; - let mut conn = Connection::connect()?; - let globals = conn.blocking_collect_initial_globals()?; + let (mut conn, globals) = Connection::connect_and_collect_globals()?; let mut state = State::new(&mut conn, &globals); conn.flush(IoMode::Blocking)?; -- cgit v1.3.1