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

9
jay-config/src/_private/client.rs
View file

@ -19,6 +19,7 @@ use {
},
Axis, Direction, ModifiedKeySym, PciId, Workspace,
},
bincode::Options,
std::{
cell::{Cell, RefCell},
collections::{hash_map::Entry, HashMap},
@ -171,7 +172,7 @@ impl Client {
fn send(&self, msg: &ClientMessage) {
let mut buf = self.bufs.borrow_mut().pop().unwrap_or_default();
buf.clear();
bincode::encode_into_std_write(msg, &mut buf, bincode_ops()).unwrap();
bincode_ops().serialize_into(&mut buf, msg).unwrap();
unsafe {
(self.srv_handler)(self.srv_data, buf.as_ptr(), buf.len());
}
@ -700,8 +701,8 @@ impl Client {
}
fn handle_msg(&self, msg: &[u8]) {
let res = bincode::borrow_decode_from_slice::<ServerMessage, _>(msg, bincode_ops());
let (msg, _) = match res {
let res = bincode_ops().deserialize::<ServerMessage>(msg);
let msg = match res {
Ok(msg) => msg,
Err(e) => {
let msg = format!("could not deserialize message: {}", e);
@ -787,7 +788,7 @@ impl Client {
}
fn handle_init_msg(&self, msg: &[u8]) {
let (init, _) = match bincode::decode_from_slice::<InitMessage, _>(msg, bincode_ops()) {
let init = match bincode_ops().deserialize::<InitMessage>(msg) {
Ok(m) => m,
Err(e) => {
let msg = format!("could not deserialize message: {}", e);

12
jay-config/src/_private/ipc.rs
View file

@ -8,11 +8,11 @@ use {
video::{connector_type::ConnectorType, Connector, DrmDevice, GfxApi},
Axis, Direction, PciId, Workspace,
},
bincode::{BorrowDecode, Decode, Encode},
serde::{Deserialize, Serialize},
std::time::Duration,
};
#[derive(Encode, BorrowDecode, Debug)]
#[derive(Serialize, Deserialize, Debug)]
pub enum ServerMessage {
Configure {
reload: bool,
@ -58,7 +58,7 @@ pub enum ServerMessage {
DevicesEnumerated,
}
#[derive(Encode, BorrowDecode, Debug)]
#[derive(Serialize, Deserialize, Debug)]
pub enum ClientMessage<'a> {
Reload,
Quit,
@ -340,7 +340,7 @@ pub enum ClientMessage<'a> {
},
}
#[derive(Encode, Decode, Debug)]
#[derive(Serialize, Deserialize, Debug)]
pub enum Response {
None,
GetSeats {
@ -442,10 +442,10 @@ pub enum Response {
},
}
#[derive(Encode, Decode, Debug)]
#[derive(Serialize, Deserialize, Debug)]
pub enum InitMessage {
V1(V1InitMessage),
}
#[derive(Encode, Decode, Debug)]
#[derive(Serialize, Deserialize, Debug)]
pub struct V1InitMessage {}