Bump deps

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2024-07-24 22:28:38 +04:00
parent ccfef172f0
commit b66058aefb
11 changed files with 552 additions and 449 deletions

950
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -2,9 +2,9 @@
name = "keycodemap" name = "keycodemap"
version = "0.1.0" version = "0.1.0"
authors = ["Marc-André Lureau <marcandre.lureau@redhat.com>"] authors = ["Marc-André Lureau <marcandre.lureau@redhat.com>"]
edition = "2018" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
phf = "0.10" phf = "0.11"

View File

@ -2,7 +2,7 @@
name = "qemu-display" name = "qemu-display"
version = "0.1.0" version = "0.1.0"
authors = ["Marc-André Lureau <marcandre.lureau@redhat.com>"] authors = ["Marc-André Lureau <marcandre.lureau@redhat.com>"]
edition = "2018" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -32,11 +32,19 @@ base64 = { version = "0.22", optional = true }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
uds_windows = "1.1" uds_windows = "1.1"
windows = { version = "0.43", features = ["Win32_Networking_WinSock", "Win32_Foundation", "Win32_System_IO", "Win32_System_Threading"] } windows = { version = "0.58", features = [
"Win32_Networking_WinSock",
"Win32_Foundation",
"Win32_System_IO",
"Win32_System_Threading",
] }
[target.'cfg(windows)'.dev-dependencies] [target.'cfg(windows)'.dev-dependencies]
async-std = { version = "1.12", features = ["attributes"] } async-std = { version = "1.12", features = ["attributes"] }
tracing-subscriber = { version = "0.3", features = ["env-filter" , "fmt"], default-features = false } tracing-subscriber = { version = "0.3", features = [
"env-filter",
"fmt",
], default-features = false }
[dev-dependencies] [dev-dependencies]
pixman-sys.workspace = true pixman-sys.workspace = true

View File

@ -179,7 +179,8 @@ impl<'d> Display<'d> {
let pid = unix_stream_get_peer_pid(&stream)?; let pid = unix_stream_get_peer_pid(&stream)?;
let info = duplicate_socket(pid, SOCKET(p0.as_raw_socket() as _))?; let info = duplicate_socket(pid, SOCKET(p0.as_raw_socket() as _))?;
let info = base64::encode(info); use base64::prelude::*;
let info = BASE64_STANDARD.encode(info);
qmp.execute(&get_win32_socket { qmp.execute(&get_win32_socket {
info, info,
fdname: "fdname".into(), fdname: "fdname".into(),

View File

@ -15,7 +15,9 @@ pub struct ProcessHandle(HANDLE);
impl Drop for ProcessHandle { impl Drop for ProcessHandle {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { CloseHandle(self.0) }; unsafe {
let _ = CloseHandle(self.0);
};
} }
} }

View File

@ -22,5 +22,6 @@ ironrdp = { git = "https://github.com/Devolutions/IronRDP", features = [
"server", "server",
"svc", "svc",
"cliprdr", "cliprdr",
"displaycontrol",
"rdpsnd" "rdpsnd"
] } ] }

View File

@ -10,7 +10,7 @@ qmp = ["qemu-display/qmp"]
[dependencies] [dependencies]
log = "0.4" log = "0.4"
pretty_env_logger = "0.4" pretty_env_logger = "0.5"
once_cell = "1.19" once_cell = "1.19"
zbus.workspace = true zbus.workspace = true
qemu-display.workspace = true qemu-display.workspace = true

View File

@ -10,10 +10,10 @@ edition = "2018"
qemu-display.workspace = true qemu-display.workspace = true
keycodemap.workspace = true keycodemap.workspace = true
vnc = "0.4.0" vnc = "0.4.0"
clap = { version = "3.2", features = ["derive"] } clap = { version = "4.5", features = ["derive"] }
zbus.workspace = true zbus.workspace = true
libc = "0.2.155" libc = "0.2.155"
image = "0.23.14" image = "0.23"
derivative = "2.2.0" derivative = "2.2.0"
async-io = "1.13.0" async-io = "2.3"
async-trait = "0.1.81" async-trait = "0.1.81"

View File

@ -5,7 +5,7 @@ edition = "2018"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
pretty_env_logger = "0.4" pretty_env_logger = "0.5"
once_cell = "1.19" once_cell = "1.19"
zbus.workspace = true zbus.workspace = true
qemu-display.workspace = true qemu-display.workspace = true

View File

@ -7,4 +7,4 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
xshell = "0.1.17" xshell = "0.2"

View File

@ -2,7 +2,7 @@ use std::{
env, env,
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use xshell::{cmd, write_file}; use xshell::{cmd, Shell};
type DynError = Box<dyn std::error::Error>; type DynError = Box<dyn std::error::Error>;
@ -55,10 +55,13 @@ fn codegen() -> Result<(), DynError> {
]; ];
for km in &keymaps { for km in &keymaps {
let varname = format!("keymap_{}2qnum", km); let varname = format!("keymap_{}2qnum", km);
let out = let sh = Shell::new()?;
cmd!("{keymap_gen} code-map --lang rust --varname {varname} {keymaps_csv} {km} qnum") let out = cmd!(
.read()?; sh,
write_file(keycodemap_src.join(format!("{}.rs", varname)), out)?; "{keymap_gen} code-map --lang rust --varname {varname} {keymaps_csv} {km} qnum"
)
.read()?;
std::fs::write(keycodemap_src.join(format!("{}.rs", varname)), out)?;
} }
Ok(()) Ok(())
} }