kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

config: downgrade bincode to 1.3.3

Browse source 
This should not have any impact on existing configs since bincode claims
compatibility of the wire format between 1.3.3 and 2.0.0.
This commit is contained in:
Julian Orth 2024-02-16 14:02:45 +01:00
parent 6921531702
commit 615acd4847
22 changed files with 91 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/forker.rs
View file

@ -17,12 +17,10 @@ use {
},
xwayland,
},
bincode::{
error::{DecodeError, EncodeError},
Decode, Encode,
},
bincode::Options,
jay_config::_private::bincode_ops,
log::Level,
serde::{Deserialize, Serialize},
std::{
cell::{Cell, RefCell},
env,
@ -65,9 +63,9 @@ pub enum ForkerError {
#[error("Could not write the next message")]
WriteFailed(#[source] BufFdError),
#[error("Could not decode the next message")]
DecodeFailed(#[source] DecodeError),
DecodeFailed(#[source] bincode::Error),
#[error("Could not encode the next message")]
EncodeFailed(#[source] EncodeError),
EncodeFailed(#[source] bincode::Error),
#[error("Could not fork")]
PidfdForkFailed,
}
@ -264,7 +262,7 @@ impl ForkerProxy {
}
}
#[derive(Encode, Decode)]
#[derive(Serialize, Deserialize)]
enum ServerMessage {
SetEnv {
var: Vec<u8>,
@ -281,7 +279,7 @@ enum ServerMessage {
},
}
#[derive(Encode, Decode)]
#[derive(Serialize, Deserialize)]
enum ForkerMessage {
Log {
level: usize,
@ -319,7 +317,7 @@ impl Forker {
level: log::Level::Error as _,
msg: format!("The ol' forker panicked: {}", pi),
};
let msg = bincode::encode_to_vec(msg, bincode_ops()).unwrap();
let msg = bincode_ops().serialize(&msg).unwrap();
let _ = Fd::new(socket).write_all(&msg);
})
});