Bump zbus & clap

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

qemu-display/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 cfg-if = "1.0"
 log = "0.4"
 derivative = "2.2.0"
-zbus = { version = "2.0", features = ["xml"] }
+zbus = { version = "3.0", features = ["xml"] }
 zvariant = { version = "3.0", features = ["serde_bytes"] }
 libc = "0.2.86"
 enumflags2 = { version = "0.7", features = ["serde"] }

qemu-display/src/util.rs

@@ -2,10 +2,10 @@ use crate::Result;
 
 #[cfg(unix)]
 use std::os::unix::{io::AsRawFd, net::UnixStream};
-#[cfg(unix)]
-use zbus::zvariant::Fd;
 #[cfg(windows)]
 use win32::Fd;
+#[cfg(unix)]
+use zbus::zvariant::Fd;
 
 #[cfg(windows)]
 use crate::win32;
@@ -29,8 +29,9 @@ pub fn prepare_uds_pass(us: &UnixStream) -> Result<Fd> {
         let pid = win32::unix_stream_get_peer_pid(us)?;
         let p = win32::ProcessHandle::open(Some(pid), PROCESS_DUP_HANDLE)?;
         let mut info = unsafe { std::mem::zeroed() };
-        if unsafe { WSADuplicateSocketW(SOCKET(us.as_raw_socket() as _), p.process_id(), &mut info) }
+        if unsafe {
-        != 0
+            WSADuplicateSocketW(SOCKET(us.as_raw_socket() as _), p.process_id(), &mut info)
+        } != 0
         {
             return Err(crate::Error::Io(win32::wsa_last_err()));
         }

qemu-rdw/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 log = "0.4"
 pretty_env_logger = "0.4"
 once_cell = "1.5"
-zbus = { version = "2.0" }
+zbus = { version = "3.0" }
 qemu-display = { path = "../qemu-display" }
 keycodemap = { path = "../keycodemap" }
 rdw = { package = "rdw4", version = "0.1", features = ["bindings"] }

qemu-vnc/Cargo.toml

@@ -10,8 +10,8 @@ edition = "2018"
 qemu-display = { path = "../qemu-display" }
 keycodemap = { path ="../keycodemap" }
 vnc = "0.4.0"
-clap = "3.0.0-beta.2"
+clap = { version = "3.2", features = ["derive"] }
-zbus = { version = "2.0.0-beta.7" }
+zbus = { version = "3.0" }
 libc = "0.2.86"
 image = "0.23.14"
 derivative = "2.2.0"

qemu-vnc/src/main.rs

@@ -9,7 +9,7 @@ use std::{
     thread, time,
 };
 
-use clap::Clap;
+use clap::Parser;
 use image::GenericImage;
 use keycodemap::*;
 use qemu_display::{Console, ConsoleListenerHandler, MouseButton, VMProxy};
@@ -18,7 +18,7 @@ use vnc::{
     Encoding, Error as VncError, PixelFormat, Rect, Screen, Server as VncServer,
 };
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 pub struct SocketAddrArgs {
     /// IP address
     #[clap(short, long, default_value = "127.0.0.1")]
@@ -34,7 +34,7 @@ impl From<SocketAddrArgs> for std::net::SocketAddr {
     }
 }
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 struct Cli {
     #[clap(flatten)]
     address: SocketAddrArgs,
@@ -319,7 +319,7 @@ impl Server {
     }
 
     async fn run_console(&self) -> Result<(), Box<dyn Error>> {
-        let mut inner = self.inner.lock().unwrap();
+        let inner = self.inner.lock().unwrap();
         inner
             .console
             .register_listener(ConsoleListener {

qemu-vte/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 log = "0.4"
 pretty_env_logger = "0.4"
 once_cell = "1.5"
-zbus = { version = "2.0" }
+zbus = { version = "3.0" }
 qemu-display = { path = "../qemu-display" }
 futures = "0.3.13"