Merge pull request #92 from mahkoh/jorth/bincode1

config: downgrade bincode to 1.3.3

Cargo.toml

@@ -29,7 +29,7 @@ once_cell = "1.19.0"
 rand = "0.8.5"
 smallvec = { version = "1.11.1", features = ["const_generics", "const_new", "union"] }
 byteorder = "1.5.0"
-bincode = "2.0.0-rc.3"
+bincode = "1.3.3"
 jay-config = { path = "jay-config" }
 default-config = { path = "default-config" }
 algorithms = { path = "algorithms" }
@@ -46,6 +46,7 @@ indexmap = "2.2.0"
 ash = "0.37.3"
 gpu-alloc = "0.6.0"
 gpu-alloc-ash = "0.6.0"
+serde = { version = "1.0.196", features = ["derive"] }
 
 [build-dependencies]
 repc = "0.1.1"

jay-config/Cargo.toml

@@ -6,5 +6,6 @@ license = "GPL-3.0-only"
 description = "Configuration crate for the Jay compositor"
 
 [dependencies]
-bincode = "2.0.0-rc.1"
+bincode = "1.3.3"
+serde = { version = "1.0.196", features = ["derive"] }
 log = "0.4.14"

jay-config/src/_private.rs

@@ -2,7 +2,7 @@ pub mod client;
 pub mod ipc;
 mod logging;
 
-use std::marker::PhantomData;
+use {bincode::Options, std::marker::PhantomData};
 
 pub const VERSION: u32 = 1;
 
@@ -26,9 +26,9 @@ pub struct ConfigEntryGen<T> {
 
 impl<T: Config> ConfigEntryGen<T> {}
 
-pub fn bincode_ops() -> impl bincode::config::Config {
-    bincode::config::standard()
-        .with_fixed_int_encoding()
+pub fn bincode_ops() -> impl Options {
+    bincode::DefaultOptions::new()
+        .with_fixint_encoding()
         .with_little_endian()
         .with_no_limit()
 }

jay-config/src/_private/client.rs

@@ -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);

jay-config/src/_private/ipc.rs

@@ -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 {}

jay-config/src/input.rs

@@ -9,11 +9,11 @@ use {
         keyboard::Keymap,
         Axis, Direction, ModifiedKeySym, Workspace,
     },
-    bincode::{Decode, Encode},
+    serde::{Deserialize, Serialize},
 };
 
 /// An input device.
-#[derive(Encode, Decode, Copy, Clone, Debug, Hash, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub struct InputDevice(pub u64);
 
 impl InputDevice {
@@ -114,7 +114,7 @@ impl InputDevice {
 }
 
 /// A seat.
-#[derive(Encode, Decode, Copy, Clone, Debug, Hash, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub struct Seat(pub u64);
 
 impl Seat {

jay-config/src/input/acceleration.rs

@@ -2,10 +2,10 @@
 //!
 //! See the libinput documentation for details.
 
-use bincode::{Decode, Encode};
+use serde::{Deserialize, Serialize};
 
 /// The acceleration profile of a device.
-#[derive(Encode, Decode, Copy, Clone, Debug, Hash, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub struct AccelProfile(pub u32);
 
 /// A flat acceleration profile.

jay-config/src/input/capability.rs

@@ -2,10 +2,10 @@
 //!
 //! See the libinput documentation for the meanings of these constants.
 
-use bincode::{Decode, Encode};
+use serde::{Deserialize, Serialize};
 
 /// A capability of an input device.
-#[derive(Encode, Decode, Copy, Clone, Debug, Hash, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub struct Capability(pub u32);
 
 pub const CAP_KEYBOARD: Capability = Capability(0);

jay-config/src/keyboard/mod.rs

@@ -2,15 +2,15 @@
 
 use {
     crate::keyboard::{mods::Modifiers, syms::KeySym},
-    bincode::{Decode, Encode},
+    serde::{Deserialize, Serialize},
     std::ops::{BitOr, BitOrAssign},
 };
 
 pub mod mods;
 pub mod syms;
 
 /// A keysym with zero or more modifiers
-#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Hash, Debug)]
+#[derive(Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Hash, Debug)]
 pub struct ModifiedKeySym {
     pub mods: Modifiers,
     pub sym: KeySym,
@@ -43,7 +43,7 @@ impl BitOrAssign<Modifiers> for ModifiedKeySym {
 }
 
 /// A keymap.
-#[derive(Encode, Decode, Copy, Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq, Hash)]
 pub struct Keymap(pub u64);
 
 impl Keymap {

jay-config/src/keyboard/mods.rs

@@ -2,12 +2,12 @@
 
 use {
     crate::{keyboard::syms::KeySym, ModifiedKeySym},
-    bincode::{Decode, Encode},
+    serde::{Deserialize, Serialize},
     std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign},
 };
 
 /// Zero or more keyboard modifiers
-#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Default, Hash, Debug)]
+#[derive(Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Default, Hash, Debug)]
 pub struct Modifiers(pub u32);
 
 /// The Shift modifier

jay-config/src/keyboard/syms.rs

@@ -2,10 +2,10 @@
 
 #![allow(non_upper_case_globals)]
 
-use bincode::{Decode, Encode};
+use serde::{Deserialize, Serialize};
 
 /// A keysym.
-#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Hash, Debug)]
+#[derive(Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Hash, Debug)]
 pub struct KeySym(pub u32);
 
 pub const SYM_BackSpace: KeySym = KeySym(0xff08);

jay-config/src/lib.rs

@@ -42,7 +42,7 @@
 
 use {
     crate::keyboard::ModifiedKeySym,
-    bincode::{Decode, Encode},
+    serde::{Deserialize, Serialize},
     std::fmt::{Debug, Display, Formatter},
 };
 
@@ -61,7 +61,7 @@ pub mod timer;
 pub mod video;
 
 /// A planar direction.
-#[derive(Encode, Decode, Copy, Clone, Debug, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq)]
 pub enum Direction {
     Left,
     Down,
@@ -70,7 +70,7 @@ pub enum Direction {
 }
 
 /// A planar axis.
-#[derive(Encode, Decode, Copy, Clone, Debug, Hash, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub enum Axis {
     Horizontal,
     Vertical,
@@ -129,7 +129,7 @@ pub fn toggle_default_workspace_capture() {
 }
 
 /// A workspace.
-#[derive(Encode, Decode, Copy, Clone, Debug, Hash, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub struct Workspace(pub u64);
 
 impl Workspace {
@@ -170,7 +170,7 @@ pub fn get_workspace(name: &str) -> Workspace {
 /// PCI IDs can be used to identify a hardware component. See the Debian [documentation][pci].
 ///
 /// [pci]: https://wiki.debian.org/HowToIdentifyADevice/PCI
-#[derive(Encode, Decode, Debug, Copy, Clone, Hash, Eq, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, Copy, Clone, Hash, Eq, PartialEq, Default)]
 pub struct PciId {
     pub vendor: u32,
     pub model: u32,

jay-config/src/logging.rs

@@ -3,10 +3,10 @@
 //! Note that you can use the `log` crate for logging. All invocations of `log::info` etc.
 //! automatically log into the compositors log.
 
-use bincode::{Decode, Encode};
+use serde::{Deserialize, Serialize};
 
 /// The log level of the compositor or a log message.
-#[derive(Encode, Decode, Copy, Clone, Debug)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug)]
 pub enum LogLevel {
     Error,
     Warn,

jay-config/src/theme.rs

@@ -1,6 +1,6 @@
 //! Tools for configuring the look of the compositor.
 
-use bincode::{Decode, Encode};
+use serde::{Deserialize, Serialize};
 
 /// A color.
 ///
@@ -15,7 +15,7 @@ use bincode::{Decode, Encode};
 ///
 /// When using hexadecimal notation, `#RRGGBBAA`, the RGB values are usually straight.
 // values are stored premultiplied
-#[derive(Encode, Decode, Debug)]
+#[derive(Serialize, Deserialize, Debug)]
 pub struct Color {
     r: f32,
     g: f32,
@@ -160,11 +160,11 @@ pub fn reset_font() {
 pub mod colors {
     use {
         crate::theme::Color,
-        bincode::{Decode, Encode},
+        serde::{Deserialize, Serialize},
     };
 
     /// An element of the GUI whose color can be changed.
-    #[derive(Encode, Decode, Copy, Clone, Debug, Hash, Eq, PartialEq)]
+    #[derive(Serialize, Deserialize, Copy, Clone, Debug, Hash, Eq, PartialEq)]
     pub struct Colorable(#[doc(hidden)] pub u32);
 
     impl Colorable {
@@ -262,10 +262,10 @@ pub mod colors {
 
 /// Elements of the compositor whose size can be changed.
 pub mod sized {
-    use bincode::{Decode, Encode};
+    use serde::{Deserialize, Serialize};
 
     /// An element of the GUI whose size can be changed.
-    #[derive(Encode, Decode, Copy, Clone, Debug, Hash, Eq, PartialEq)]
+    #[derive(Serialize, Deserialize, Copy, Clone, Debug, Hash, Eq, PartialEq)]
     pub struct Resizable(#[doc(hidden)] pub u32);
 
     impl Resizable {