wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-22 04:56:12 +03:00
Code Issues Projects Releases Wiki Activity

deps: upgrade smol to 2.0

Browse Source
This commit is contained in:
Wez Furlong 2024-05-13 10:01:35 -07:00
parent 421ce4f0e1
commit 1ca5e6cc90
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
22 changed files with 82 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Cargo.lock generated
View File

@ -204,17 +204,6 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "async-channel"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
dependencies = [
"concurrent-queue",
"event-listener 2.5.3",
"futures-core",
]
[[package]]
name = "async-channel"
version = "2.3.0"
@ -241,18 +230,6 @@ dependencies = [
"slab",
]
[[package]]
name = "async-fs"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
dependencies = [
"async-lock 2.8.0",
"autocfg",
"blocking",
"futures-lite 1.13.0",
]
[[package]]
name = "async-fs"
version = "2.1.2"
@ -325,30 +302,13 @@ dependencies = [
[[package]]
name = "async-net"
version = "1.8.0"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f"
checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
dependencies = [
"async-io 1.13.0",
"async-io 2.3.2",
"blocking",
"futures-lite 1.13.0",
]
[[package]]
name = "async-process"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
dependencies = [
"async-io 1.13.0",
"async-lock 2.8.0",
"async-signal",
"blocking",
"cfg-if",
"event-listener 3.1.0",
"futures-lite 1.13.0",
"rustix 0.38.34",
"windows-sys 0.48.0",
"futures-lite 2.3.0",
]
[[package]]
@ -357,7 +317,7 @@ version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d"
dependencies = [
"async-channel 2.3.0",
"async-channel",
"async-io 2.3.2",
"async-lock 3.3.0",
"async-signal",
@ -421,6 +381,7 @@ dependencies = [
name = "async_ossl"
version = "0.1.0"
dependencies = [
"async-io 2.3.2",
"openssl",
]
@ -592,7 +553,7 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88"
dependencies = [
"async-channel 2.3.0",
"async-channel",
"async-lock 3.3.0",
"async-task",
"futures-io",
@ -1639,17 +1600,6 @@ version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "event-listener"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
dependencies = [
"concurrent-queue",
"parking",
"pin-project-lite",
]
[[package]]
name = "event-listener"
version = "4.0.3"
@ -4334,7 +4284,7 @@ version = "0.2.0"
dependencies = [
"anyhow",
"async-executor",
"async-io 1.13.0",
"async-io 2.3.2",
"async-task",
"flume 0.10.14",
"lazy_static",
@ -5197,19 +5147,19 @@ dependencies = [
[[package]]
name = "smol"
version = "1.3.0"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
checksum = "e635339259e51ef85ac7aa29a1cd991b957047507288697a690e80ab97d07cad"
dependencies = [
"async-channel 1.9.0",
"async-channel",
"async-executor",
"async-fs 1.6.0",
"async-io 1.13.0",
"async-lock 2.8.0",
"async-fs",
"async-io 2.3.2",
"async-lock 3.3.0",
"async-net",
"async-process 1.8.1",
"async-process",
"blocking",
"futures-lite 1.13.0",
"futures-lite 2.3.0",
]
[[package]]
@ -6479,6 +6429,7 @@ name = "wezterm-client"
version = "0.1.0"
dependencies = [
"anyhow",
"async-io 2.3.2",
"async-trait",
"async_ossl",
"codec",
@ -6731,6 +6682,7 @@ name = "wezterm-mux-server-impl"
version = "0.1.0"
dependencies = [
"anyhow",
"async-io 2.3.2",
"async_ossl",
"codec",
"config",
@ -6828,7 +6780,7 @@ dependencies = [
name = "wezterm-toast-notification"
version = "0.1.0"
dependencies = [
"async-io 1.13.0",
"async-io 2.3.2",
"cocoa 0.20.2",
"core-foundation 0.7.0",
"futures-util",
@ -7016,8 +6968,8 @@ name = "window"
version = "0.1.0"
dependencies = [
"anyhow",
"async-channel 1.9.0",
"async-io 1.13.0",
"async-channel",
"async-io 2.3.2",
"async-task",
"async-trait",
"bitflags 1.3.2",
@ -7527,10 +7479,10 @@ checksum = "e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21"
dependencies = [
"async-broadcast",
"async-executor",
"async-fs 2.1.2",
"async-fs",
"async-io 2.3.2",
"async-lock 3.3.0",
"async-process 2.2.2",
"async-process",
"async-recursion",
"async-task",
"async-trait",

3
async_ossl/Cargo.toml
View File

@ -8,6 +8,9 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
async-io = "2.3"
[target.'cfg(not(any(windows, target_os="macos")))'.dependencies]
openssl = "0.10"

9
async_ossl/src/lib.rs
View File

@ -11,12 +11,21 @@ pub struct AsyncSslStream {
s: SslStream<TcpStream>,
}
unsafe impl async_io::IoSafe for AsyncSslStream {}
impl AsyncSslStream {
pub fn new(s: SslStream<TcpStream>) -> Self {
Self { s }
}
}
#[cfg(unix)]
impl std::os::fd::AsFd for AsyncSslStream {
fn as_fd(&self) -> std::os::fd::BorrowedFd {
self.s.get_ref().as_fd()
}
}
#[cfg(unix)]
impl std::os::unix::io::AsRawFd for AsyncSslStream {
fn as_raw_fd(&self) -> std::os::unix::io::RawFd {

2
codec/Cargo.toml
View File

@ -17,7 +17,7 @@ mux = { path = "../mux" }
portable-pty = { path = "../pty", features = ["serde_support"]}
rangeset = { path = "../rangeset" }
serde = {version="1.0", features = ["rc", "derive"]}
smol = "1.2"
smol = "2.0"
termwiz = { path = "../termwiz" }
thiserror = "1.0"
varbincode = "0.1"

2
config/Cargo.toml
View File

@ -34,7 +34,7 @@ promise = { path = "../promise" }
serde = {version="1.0", features = ["rc", "derive"]}
serde_json = "1.0"
shlex = "1.1"
smol = "1.2"
smol = "2.0"
termwiz = { path = "../termwiz", features=["use_serde"] }
toml = "0.8"
umask = { path = "../umask" }

12
filedescriptor/src/unix.rs
View File

@ -61,6 +61,12 @@ impl Drop for OwnedHandle {
}
}
impl std::os::fd::AsFd for OwnedHandle {
fn as_fd(&self) -> std::os::fd::BorrowedFd {
unsafe { std::os::fd::BorrowedFd::borrow_raw(self.handle) }
}
}
impl AsRawFd for OwnedHandle {
fn as_raw_fd(&self) -> RawFd {
self.handle
@ -224,6 +230,12 @@ impl std::io::Write for FileDescriptor {
}
}
impl std::os::fd::AsFd for FileDescriptor {
fn as_fd(&self) -> std::os::fd::BorrowedFd {
self.handle.as_fd()
}
}
impl AsRawFd for FileDescriptor {
fn as_raw_fd(&self) -> RawFd {
self.handle.as_raw_fd()

2
lua-api-crates/filesystem/Cargo.toml
View File

@ -11,4 +11,4 @@ filenamegen = "0.2"
anyhow = "1.0"
config = { path = "../../config" }
luahelper = { path = "../../luahelper" }
smol = "1.2"
smol = "2.0"

2
lua-api-crates/mux/Cargo.toml
View File

@ -16,7 +16,7 @@ log = "0.4"
luahelper = { path = "../../luahelper" }
parking_lot = "0.12"
portable-pty = { path = "../../pty" }
smol = "1.2"
smol = "2.0"
termwiz = { path = "../../termwiz" }
termwiz-funcs = { path = "../termwiz-funcs" }
mux = { path = "../../mux" }

2
lua-api-crates/spawn-funcs/Cargo.toml
View File

@ -12,7 +12,7 @@ config = { path = "../../config" }
wezterm-dynamic = { path = "../../wezterm-dynamic" }
log = "0.4"
luahelper = { path = "../../luahelper" }
smol = "1.2"
smol = "2.0"
bstr = "1.0"
wezterm-open-url = { path = "../../wezterm-open-url" }

2
lua-api-crates/time-funcs/Cargo.toml
View File

@ -13,6 +13,6 @@ config = { path = "../../config" }
luahelper = { path = "../../luahelper" }
lazy_static = "1.4"
promise = { path = "../../promise" }
smol = "1.2"
smol = "2.0"
spa = "0.3.1"
wezterm-dynamic = { path = "../../wezterm-dynamic" }

2
mux/Cargo.toml
View File

@ -38,7 +38,7 @@ rangeset = { path = "../rangeset" }
serde = {version="1.0", features = ["rc", "derive"]}
serial = "0.4"
shell-words = "1.1"
smol = "1.2"
smol = "2.0"
terminfo = "0.8"
termwiz = { path = "../termwiz" }
termwiz-funcs = { path = "../lua-api-crates/termwiz-funcs" }

6
promise/Cargo.toml
View File

@ -6,9 +6,9 @@ edition = "2018"
publish = false
[dependencies]
async-task = "4.0"
async-executor = "1.4"
async-io = "1.10"
async-task = "4.7"
async-executor = "1.11"
async-io = "2.3"
anyhow = "1.0"
thiserror = "1.0"
lazy_static = "1.4"

2
pty/Cargo.toml
View File

@ -39,5 +39,5 @@ winapi = { version = "0.3", features = [
winreg = "0.10"
[dev-dependencies]
smol = "1.2"
smol = "2.0"
futures = "0.3"

3
wezterm-client/Cargo.toml
View File

@ -11,6 +11,7 @@ publish = false
anyhow = "1.0"
async-trait = "0.1"
async_ossl = { path = "../async_ossl" }
async-io = "2.3"
codec = { path = "../codec" }
config = { path = "../config" }
filedescriptor = { version="0.8", path = "../filedescriptor" }
@ -27,7 +28,7 @@ portable-pty = { path = "../pty", features = ["serde_support"]}
promise = { path = "../promise" }
rangeset = { path = "../rangeset" }
ratelim= { path = "../ratelim" }
smol = "1.2"
smol = "2.0"
termwiz = { path = "../termwiz" }
textwrap = "0.16"
thiserror = "1.0"

10
wezterm-client/src/client.rs
View File

@ -524,6 +524,7 @@ where
T: std::io::Write,
T: std::io::Read,
T: Send,
T: async_io::IoSafe,
{
async fn wait_for_readable(&self) -> anyhow::Result<()> {
Ok(self.readable().await?)
@ -542,12 +543,21 @@ struct SshStream {
stdout: FileDescriptor,
}
unsafe impl async_io::IoSafe for SshStream {}
impl std::fmt::Debug for SshStream {
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> {
write!(fmt, "SshStream {{...}}")
}
}
#[cfg(unix)]
impl std::os::fd::AsFd for SshStream {
fn as_fd(&self) -> std::os::fd::BorrowedFd {
self.stdout.as_fd()
}
}
#[cfg(unix)]
impl std::os::unix::io::AsRawFd for SshStream {
fn as_raw_fd(&self) -> std::os::unix::io::RawFd {

2
wezterm-gui/Cargo.toml
View File

@ -78,7 +78,7 @@ regex = "1"
serde = {version="1.0", features = ["rc", "derive"]}
serde_json = "1.0"
shlex = "1.1"
smol = "1.2"
smol = "2.0"
tabout = { path = "../tabout" }
tempfile = "3.4"
terminfo = "0.8"

3
wezterm-mux-server-impl/Cargo.toml
View File

@ -10,6 +10,7 @@ publish = false
[dependencies]
anyhow = "1.0"
async_ossl = { path = "../async_ossl" }
async-io = "2.3"
codec = { path = "../codec" }
config = { path = "../config" }
futures = "0.3"
@ -21,7 +22,7 @@ portable-pty = { path = "../pty", features = ["serde_support"]}
promise = { path = "../promise" }
rangeset = { path = "../rangeset" }
rcgen = "0.12"
smol = "1.2"
smol = "2.0"
url = "2"
wezterm-client = { path = "../wezterm-client" }
wezterm-term = { path = "../term", features=["use_serde"] }

4
wezterm-mux-server-impl/src/dispatch.rs
View File

@ -9,7 +9,7 @@ use smol::prelude::*;
use smol::Async;
#[cfg(unix)]
pub trait AsRawDesc: std::os::unix::io::AsRawFd {}
pub trait AsRawDesc: std::os::unix::io::AsRawFd + std::os::fd::AsFd {}
#[cfg(windows)]
pub trait AsRawDesc: std::os::windows::io::AsRawSocket {}
@ -30,6 +30,7 @@ where
T: std::io::Write,
T: AsRawDesc,
T: std::fmt::Debug,
T: async_io::IoSafe,
{
let stream = smol::Async::new(stream)?;
process_async(stream).await
@ -41,6 +42,7 @@ where
T: std::io::Read,
T: std::io::Write,
T: std::fmt::Debug,
T: async_io::IoSafe,
{
log::trace!("process_async called");

2
wezterm-ssh/Cargo.toml
View File

@ -29,7 +29,7 @@ libc = "0.2"
log = "0.4"
portable-pty = { version="0.8", path = "../pty" }
regex = "1"
smol = "1.2"
smol = "2.0"
ssh2 = {version="0.9.3", features=["openssl-on-win32"], optional = true}
libssh-rs = {version="0.3.2", features=["vendored"], optional = true}
#libssh-rs = {path="../../libssh-rs/libssh-rs", features=["vendored"], optional = true}

2
wezterm-toast-notification/Cargo.toml
View File

@ -16,7 +16,7 @@ log = "0.4"
serde = {version="1.0", features = ["derive"]}
zbus = "4.2"
zvariant = "4.0"
async-io = "1.10"
async-io = "2.3"
futures-util = "0.3"
[target.'cfg(target_os="macos")'.dependencies]

2
wezterm/Cargo.toml
View File

@ -28,7 +28,7 @@ promise = { path = "../promise" }
serde = {version="1.0", features = ["derive"]}
serde_json = "1.0"
shell-words = "1.1"
smol = "1.2"
smol = "2.0"
tabout = { path = "../tabout" }
tempfile = "3.3"
termwiz = { path = "../termwiz" }

6
window/Cargo.toml
View File

@ -18,9 +18,9 @@ gl_generator = "0.14"
wayland = ["wayland-client", "smithay-client-toolkit", "wayland-egl", "wayland-protocols"]
[dependencies]
async-channel = "1.6"
async-io = "1.1"
async-task = "4.0"
async-channel = "2.3"
async-io = "2.3"
async-task = "4.7"
async-trait = "0.1"
anyhow = "1.0"
bytes = "1.0"