Drop byteorder dep

Author: kornelski

rmp-serde/Cargo.toml

@@ -3,7 +3,7 @@ name = "rmp-serde"
 version = "1.3.1"
 authors = ["Evgeny Safronov <division494@gmail.com>"]
 license = "MIT"
-description = "Serde bindings for RMP"
+description = "Serde support for MessagePack"
 repository = "https://github.com/3Hren/msgpack-rust"
 documentation = "https://docs.rs/rmp-serde"
 readme = "README.md"
@@ -16,7 +16,6 @@ rust-version = "1.85"
 tag-prefix = "{{crate_name}}/"
 
 [dependencies]
-byteorder = "1.5.0"
 serde = "1.0.228"
 rmp = { version = "0.8.14", path = "../rmp" }
 

rmp-serde/src/decode.rs

@@ -9,8 +9,6 @@ use std::marker::PhantomData;
 use std::num::TryFromIntError;
 use std::str::{self, Utf8Error};
 
-use byteorder::{self, ReadBytesExt};
-
 use serde;
 use serde::de::value::SeqDeserializer;
 use serde::de::{self, Deserialize, DeserializeOwned, DeserializeSeed, Unexpected, Visitor};
@@ -382,17 +380,21 @@ fn read_bin_data<'a, 'de, R: ReadSlice<'de>>(rd: &'a mut R, len: u32) -> Result<
 }
 
 fn read_u8<R: Read>(rd: &mut R) -> Result<u8, Error> {
-    byteorder::ReadBytesExt::read_u8(rd).map_err(Error::InvalidDataRead)
+    let mut buf = [0; 1];
+    rd.read_exact(&mut buf).map_err(Error::InvalidDataRead)?;
+    Ok(buf[0])
 }
 
 fn read_u16<R: Read>(rd: &mut R) -> Result<u16, Error> {
-    rd.read_u16::<byteorder::BigEndian>()
-        .map_err(Error::InvalidDataRead)
+    let mut buf = [0; 2];
+    rd.read_exact(&mut buf).map_err(Error::InvalidDataRead)?;
+    Ok(u16::from_be_bytes(buf))
 }
 
 fn read_u32<R: Read>(rd: &mut R) -> Result<u32, Error> {
-    rd.read_u32::<byteorder::BigEndian>()
-        .map_err(Error::InvalidDataRead)
+    let mut buf = [0; 4];
+    rd.read_exact(&mut buf).map_err(Error::InvalidDataRead)?;
+    Ok(u32::from_be_bytes(buf))
 }
 
 fn ext_len<R: Read>(rd: &mut R, marker: Marker) -> Result<u32, Error> {

rmp/Cargo.toml

@@ -13,14 +13,11 @@ edition = "2024"
 rust-version = "1.85"
 
 [dependencies]
-byteorder = { version = "1.5.0", default-features = false }
 num-traits = { version = "0.2.19", default-features = false }
-# This is macro_only ;)
-paste = "1.0"
 
 [features]
 default = ["std"]
-std = ["byteorder/std", "num-traits/std"]
+std = ["num-traits/std"]
 
 [[example]]
 name = "inspect"

rmp/src/decode/mod.rs

@@ -62,9 +62,7 @@ macro_rules! read_byteorder_utils {
                 const SIZE: usize = core::mem::size_of::<$tp>();
                 let mut buf: [u8; SIZE] = [0u8; SIZE];
                 self.read_exact_buf(&mut buf).map_err(ValueReadError::InvalidDataRead)?;
-                Ok(paste::paste! {
-                    <byteorder::BigEndian as byteorder::ByteOrder>::[<read_ $tp>](&mut buf)
-                })
+                Ok($tp::from_be_bytes(buf))
             }
         )*
     };
@@ -83,8 +81,6 @@ mod sealed {
 /// The methods of this trait should be considered an implementation detail (for now).
 /// It is currently sealed (can not be implemented by the user).
 ///
-/// See also [`std::io::Read`] and [`byteorder::ReadBytesExt`]
-///
 /// Its primary implementations are [`std::io::Read`] and [Bytes].
 pub trait RmpRead: sealed::Sealed {
     type Error: RmpReadErr;
@@ -130,40 +126,6 @@ pub trait RmpRead: sealed::Sealed {
     );
 }
 
-/*
- * HACK: rmpv & rmp-erde used the internal read_data_* functions.
- *
- * Since adding no_std support moved these functions to the RmpRead trait,
- * this broke compatiblity  (despite changing no public APIs).
- *
- * In theory, we could update rmpv and rmp-serde to use the new APIS,
- * but that would be needless churn (and might surprise users who just want to update rmp proper).
- *
- * Instead, we emulate these internal APIs for now,
- * so that rmpv and rmp-serde continue to compile without issue.
- *
- *
- * TODO: Remove this hack once we release a new version of rmp proper
- */
-
-macro_rules! wrap_data_funcs_for_compatibility {
-    ($($tp:ident),* $(,)?) => {
-        $(paste::paste! {
-            #[cfg(feature = "std")]
-            #[doc(hidden)]
-            #[deprecated(note = "internal function. rmpv & rmp-serde need to switch to RmpRead")]
-            pub fn [<read_data_ $tp>] <R: std::io::Read>(buf: &mut R) -> Result<$tp, ValueReadError> {
-                buf.[<read_data_ $tp>]()
-            }
-        })*
-    };
-}
-wrap_data_funcs_for_compatibility!(
-    u8, u16, u32, u64,
-    i8, i16, i32, i64,
-    f32, f64
-);
-
 #[cfg(feature = "std")]
 impl<T: std::io::Read> RmpRead for T {
     type Error = std::io::Error;

rmp/src/encode/mod.rs

@@ -119,12 +119,7 @@ macro_rules! write_byteorder_utils {
             #[inline]
             #[doc(hidden)]
             fn $name(&mut self, val: $tp) -> Result<(), DataWriteError<Self::Error>> where Self: Sized {
-                const SIZE: usize = core::mem::size_of::<$tp>();
-                let mut buf: [u8; SIZE] = [0u8; SIZE];
-                paste::paste! {
-                    <byteorder::BigEndian as byteorder::ByteOrder>::[<write_ $tp>](&mut buf, val);
-                }
-                self.write_bytes(&buf).map_err(DataWriteError)
+                self.write_bytes(&val.to_be_bytes()).map_err(DataWriteError)
             }
         )*
     };
@@ -135,8 +130,6 @@ macro_rules! write_byteorder_utils {
 /// The methods of this trait should be considered an implementation detail (for now).
 /// It is currently sealed (can not be implemented by the user).
 ///
-/// See also [`std::io::Write`] and [`byteorder::WriteBytesExt`]
-///
 /// Its primary implementations are [`std::io::Write`] and [`ByteBuf`].
 pub trait RmpWrite: sealed::Sealed {
     type Error: RmpWriteErr;

rmpv/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "rmpv"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["Evgeny Safronov <division494@gmail.com>"]
 license = "MIT"
-description = "Value variant for RMP"
+description = "Decoding/Encoding MessagePack values without schema"
 repository = "https://github.com/3Hren/msgpack-rust"
 documentation = "https://docs.rs/rmpv"
 readme = "README.md"