From 0ce10f2703c19267c2d82b2ecfbef789a216e100 Mon Sep 17 00:00:00 2001 From: MaxVerevkin Date: Sun, 23 Jul 2023 16:36:38 +0300 Subject: cargo update --- Cargo.lock | 120 +++++++++++-------------- Cargo.toml | 6 +- 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 +- 9 files changed, 67 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f999cbd..7a90a23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "autocfg" @@ -61,20 +61,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "futures-channel" @@ -116,7 +107,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.27", ] [[package]] @@ -272,9 +263,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "libc" @@ -396,9 +387,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -448,9 +439,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -466,44 +457,44 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -530,9 +521,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -558,9 +549,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "static_assertions" @@ -581,9 +572,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.22" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -605,35 +596,35 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.8" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.27", ] [[package]] name = "toml" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -652,9 +643,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap", "serde", @@ -665,15 +656,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "version-compare" @@ -689,9 +674,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wayrs-client" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6f89c575e1d2c7e2a3dec9edb025fffdec377dbdc60942f90edb6cfc7ef715" +checksum = "64c35241948a7e6ab625fd29a65f99aaf4260c2ea00a1d41cd2a38db3a3e0ae7" dependencies = [ "nix", "thiserror", @@ -700,32 +685,31 @@ dependencies = [ [[package]] name = "wayrs-protocols" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9a43b66e8242067ed8b3f5aa8d546d1098697d16f578878b9e90c2022ddbba2" +checksum = "9df58f7f62f777b2ddcac5a3c3bfc236341c7cd45bfbf24358d2635effb16302" dependencies = [ "wayrs-client", ] [[package]] name = "wayrs-scanner" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8267a5e3ec9d13e8b4d24d0643aac9492faeac8769cdae71930998430e057a99" +checksum = "1aad469a34101deb699561cd166e539fae50a2519d1f15d38f57318f20adb020" dependencies = [ - "convert_case", "proc-macro-crate", "proc-macro2", "quick-xml", "quote", - "syn 2.0.22", + "syn 2.0.27", ] [[package]] name = "wayrs-utils" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc8bb39e4f4a331ae3c5ed33c344d776e0e8cace7892ba91a0cc6b2a6453095" +checksum = "57d73ed327a988a7c865cbbfed40c5c6909242fbcd7f134714c9a6e2f395b314" dependencies = [ "memmap2", "shmemfdrs", @@ -759,9 +743,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 152fa76..09aea6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,9 +21,9 @@ memchr = "2" signal-hook = { version = "0.3", default-features = false } nix = { version = "0.26", default-features = false, features = ["fs", "poll"] } -wayrs-client = "0.10" -wayrs-utils = { version = "0.6.0", features = ["cursor", "shm_alloc", "seats"] } -wayrs-protocols = { version = "0.10", features = ["wlr-layer-shell-unstable-v1", "viewporter", "fractional-scale-v1"] } +wayrs-client = "0.11" +wayrs-utils = { version = "0.7", features = ["cursor", "shm_alloc", "seats"] } +wayrs-protocols = { version = "0.11", features = ["wlr-layer-shell-unstable-v1", "viewporter", "fractional-scale-v1"] } [profile.release] lto = "fat" 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