pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(deps): update some dependencies (#4019)

Browse source 
* chore(deps): update some dependencies

* adjust logging to catch potential ipc issues

* style(fmt): remove outdated comment
This commit is contained in:
Aram Drevekenin 2025-02-24 11:39:44 +01:00 • committed by GitHub
parent bdfcfb0abd
commit 20011a83f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -197,7 +197,7 @@ dependencies = [
"log", "log",
"parking", "parking",
"polling", "polling",
"rustix 0.37.7", "rustix 0.37.28",
"slab", "slab",
"socket2 0.4.9", "socket2 0.4.9",
"waker-fn", "waker-fn",
@ -463,7 +463,7 @@ dependencies = [
"cap-primitives", "cap-primitives",
"cap-std", "cap-std",
"io-lifetimes 2.0.3", "io-lifetimes 2.0.3",
"windows-sys 0.59.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -491,7 +491,7 @@ dependencies = [
"ipnet", "ipnet",
"maybe-owned", "maybe-owned",
"rustix 0.38.44", "rustix 0.38.44",
"windows-sys 0.59.0", "windows-sys 0.52.0",
"winx", "winx",
] ]
@ -1171,7 +1171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.59.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -1852,7 +1852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65" checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65"
dependencies = [ dependencies = [
"io-lifetimes 2.0.3", "io-lifetimes 2.0.3",
"windows-sys 0.59.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -1886,7 +1886,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
dependencies = [ dependencies = [
"hermit-abi 0.3.1", "hermit-abi 0.3.1",
"io-lifetimes 1.0.10", "io-lifetimes 1.0.10",
"rustix 0.37.7", "rustix 0.37.28",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
@ -3106,9 +3106,9 @@ checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
[[package]] [[package]]
name = "rmp" name = "rmp"
version = "0.8.11" version = "0.8.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"num-traits", "num-traits",
@ -3117,9 +3117,9 @@ dependencies = [
[[package]] [[package]]
name = "rmp-serde" name = "rmp-serde"
version = "1.1.0" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25786b0d276110195fa3d6f3f31299900cf71dfbd6c28450f3f58a0e7f7a347e" checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"rmp", "rmp",
@ -3149,16 +3149,16 @@ dependencies = [
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.37.7" version = "0.37.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"errno", "errno",
"io-lifetimes 1.0.10", "io-lifetimes 1.0.10",
"libc", "libc",
"linux-raw-sys 0.3.7", "linux-raw-sys 0.3.7",
"windows-sys 0.45.0", "windows-sys 0.48.0",
] ]
[[package]] [[package]]
@ -3173,7 +3173,7 @@ dependencies = [
"libc", "libc",
"linux-raw-sys 0.4.15", "linux-raw-sys 0.4.15",
"once_cell", "once_cell",
"windows-sys 0.59.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]

2
zellij-server/src/os_input_output.rs
View file

@ -387,8 +387,6 @@ impl ClientSender {
for msg in client_buffer_receiver.iter() { for msg in client_buffer_receiver.iter() {
sender.send(msg).with_context(err_context).non_fatal(); sender.send(msg).with_context(err_context).non_fatal();
} }
// If we're here, the message buffer is broken for some reason
log::error!("Client buffer overflow!");
let _ = sender.send(ServerToClientMsg::Exit(ExitReason::Disconnect)); let _ = sender.send(ServerToClientMsg::Exit(ExitReason::Disconnect));
}); });
ClientSender { ClientSender {

6
zellij-utils/src/ipc.rs
View file

@ -187,9 +187,9 @@ impl<T: Serialize> IpcSenderWithContext<T> {
if rmp_serde::encode::write(&mut self.sender, &(msg, err_ctx)).is_err() { if rmp_serde::encode::write(&mut self.sender, &(msg, err_ctx)).is_err() {
Err(anyhow!("failed to send message to client")) Err(anyhow!("failed to send message to client"))
} else { } else {
// TODO: unwrapping here can cause issues when the server disconnects which we don't mind if let Err(e) = self.sender.flush() {
// do we need to handle errors here in other cases? log::error!("Failed to flush ipc sender: {}", e);
let _ = self.sender.flush(); }
Ok(()) Ok(())
} }
} }