From 0ce10f2703c19267c2d82b2ecfbef789a216e100 Mon Sep 17 00:00:00 2001
From: MaxVerevkin <maxxverrr@gmail.com>
Date: Sun, 23 Jul 2023 16:36:38 +0300
Subject: cargo update

---
 src/bar.rs                                     | 2 +-
 src/main.rs                                    | 9 ++++-----
 src/state.rs                                   | 4 ++--
 src/status_cmd.rs                              | 2 +-
 src/wm_info_provider.rs                        | 2 +-
 src/wm_info_provider/ext_workspace_unstable.rs | 2 +-
 src/wm_info_provider/river.rs                  | 4 ++--
 7 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/bar.rs b/src/bar.rs
index 775c50a..3a81bf2 100644
--- a/src/bar.rs
+++ b/src/bar.rs
@@ -1,6 +1,6 @@
 use pangocairo::cairo;
 
-use wayrs_client::connection::Connection;
+use wayrs_client::Connection;
 use wayrs_utils::shm_alloc::BufferSpec;
 
 use crate::blocks_cache::ComputedBlock;
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)?;
 
diff --git a/src/state.rs b/src/state.rs
index 7a4d850..c4d67c6 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -3,11 +3,11 @@ use crate::protocol::*;
 use crate::wm_info_provider::*;
 
 use std::fmt::Display;
-use std::os::fd::{AsRawFd, RawFd};
+use std::os::unix::io::{AsRawFd, RawFd};
 
-use wayrs_client::connection::Connection;
 use wayrs_client::global::{Global, GlobalExt, Globals, GlobalsExt};
 use wayrs_client::proxy::Proxy;
+use wayrs_client::Connection;
 use wayrs_utils::cursor::{CursorImage, CursorShape, CursorTheme, ThemedPointer};
 use wayrs_utils::seats::{SeatHandler, Seats};
 use wayrs_utils::shm_alloc::ShmAlloc;
diff --git a/src/status_cmd.rs b/src/status_cmd.rs
index 476204e..539ee3a 100644
--- a/src/status_cmd.rs
+++ b/src/status_cmd.rs
@@ -1,5 +1,5 @@
 use std::io::{BufWriter, Write};
-use std::os::fd::{AsRawFd, RawFd};
+use std::os::unix::io::{AsRawFd, RawFd};
 use std::process::{Child, ChildStdin, ChildStdout, Command, Stdio};
 
 use anyhow::Result;
diff --git a/src/wm_info_provider.rs b/src/wm_info_provider.rs
index e11e48e..96d76db 100644
--- a/src/wm_info_provider.rs
+++ b/src/wm_info_provider.rs
@@ -1,5 +1,5 @@
-use wayrs_client::connection::Connection;
 use wayrs_client::global::*;
+use wayrs_client::Connection;
 
 use crate::pointer_btn::PointerBtn;
 use crate::protocol::*;
diff --git a/src/wm_info_provider/ext_workspace_unstable.rs b/src/wm_info_provider/ext_workspace_unstable.rs
index ffbe8e7..467be2b 100644
--- a/src/wm_info_provider/ext_workspace_unstable.rs
+++ b/src/wm_info_provider/ext_workspace_unstable.rs
@@ -1,7 +1,7 @@
-use wayrs_client::connection::Connection;
 use wayrs_client::global::*;
 use wayrs_client::object::ObjectId;
 use wayrs_client::proxy::Proxy;
+use wayrs_client::Connection;
 
 use super::*;
 use crate::state::State;
diff --git a/src/wm_info_provider/river.rs b/src/wm_info_provider/river.rs
index d41e061..b5683ab 100644
--- a/src/wm_info_provider/river.rs
+++ b/src/wm_info_provider/river.rs
@@ -1,7 +1,7 @@
 use std::ffi::CString;
 
-use wayrs_client::connection::Connection;
-use wayrs_client::{cstr, global::*};
+use wayrs_client::global::*;
+use wayrs_client::{cstr, Connection};
 
 use super::*;
 use crate::state::State;
-- 
cgit v1.3.1