From 45e94318f01e79ed48c624b8f8f7ba46ca0afa9e Mon Sep 17 00:00:00 2001 From: Cai Bear Date: Sat, 23 Mar 2024 00:20:08 -0700 Subject: [PATCH] Remove unused Debug derives/impls. --- src/bool.rs | 4 ++-- src/derive/array.rs | 2 -- src/derive/empty.rs | 2 +- src/derive/impls.rs | 2 -- src/derive/map.rs | 2 -- src/derive/option.rs | 2 -- src/derive/result.rs | 2 -- src/derive/smart_ptr.rs | 1 - src/derive/variant.rs | 15 +++++++-------- src/derive/vec.rs | 2 -- src/f32.rs | 4 ++-- src/fast.rs | 15 +-------------- src/int.rs | 4 ++-- src/length.rs | 4 ++-- src/pack_ints.rs | 7 +++---- src/serde/de.rs | 1 - src/serde/ser.rs | 2 -- src/serde/variant.rs | 4 ++-- src/str.rs | 4 ++-- src/u8_char.rs | 4 ++-- 20 files changed, 26 insertions(+), 57 deletions(-) diff --git a/src/bool.rs b/src/bool.rs index c8bd049..1447b31 100644 --- a/src/bool.rs +++ b/src/bool.rs @@ -3,7 +3,7 @@ use crate::fast::{CowSlice, NextUnchecked, PushUnchecked, SliceImpl, Unaligned, use crate::pack::{pack_bools, unpack_bools}; use std::num::NonZeroUsize; -#[derive(Debug, Default)] +#[derive(Default)] pub struct BoolEncoder(VecImpl); impl Encoder for BoolEncoder { @@ -29,7 +29,7 @@ impl Buffer for BoolEncoder { } } -#[derive(Debug, Default)] +#[derive(Default)] pub struct BoolDecoder<'a>(CowSlice<'a, bool>); impl<'a> View<'a> for BoolDecoder<'a> { diff --git a/src/derive/array.rs b/src/derive/array.rs index 3fc2639..79d460d 100644 --- a/src/derive/array.rs +++ b/src/derive/array.rs @@ -5,7 +5,6 @@ use crate::fast::{FastSlice, FastVec, Unaligned}; use std::mem::MaybeUninit; use std::num::NonZeroUsize; -#[derive(Debug)] pub struct ArrayEncoder(T::Encoder); // Can't derive since it would bound T: Default. @@ -59,7 +58,6 @@ impl Buffer for ArrayEncoder { } } -#[derive(Debug)] pub struct ArrayDecoder<'a, T: Decode<'a>, const N: usize>(T::Decoder); // Can't derive since it would bound T: Default. diff --git a/src/derive/empty.rs b/src/derive/empty.rs index 8961799..1e1ec6d 100644 --- a/src/derive/empty.rs +++ b/src/derive/empty.rs @@ -2,7 +2,7 @@ use crate::coder::{Buffer, Decoder, Encoder, Result, View}; use std::marker::PhantomData; use std::num::NonZeroUsize; -#[derive(Debug, Default)] +#[derive(Default)] pub struct EmptyCoder; impl Encoder> for EmptyCoder { diff --git a/src/derive/impls.rs b/src/derive/impls.rs index a431ef3..5e35856 100644 --- a/src/derive/impls.rs +++ b/src/derive/impls.rs @@ -188,7 +188,6 @@ macro_rules! impl_tuples { type Encoder = TupleEncoder<$($name,)*>; } - #[derive(Debug)] pub struct TupleEncoder<$($name: Encode,)*>( $($name::Encoder,)* ); @@ -235,7 +234,6 @@ macro_rules! impl_tuples { type Decoder = TupleDecoder<'a, $($name,)*>; } - #[derive(Debug)] pub struct TupleDecoder<'a, $($name: Decode<'a>,)*>( $($name::Decoder,)* std::marker::PhantomData<&'a ()>, diff --git a/src/derive/map.rs b/src/derive/map.rs index c85e58c..4b5ce04 100644 --- a/src/derive/map.rs +++ b/src/derive/map.rs @@ -5,7 +5,6 @@ use std::collections::{BTreeMap, HashMap}; use std::hash::{BuildHasher, Hash}; use std::num::NonZeroUsize; -#[derive(Debug)] pub struct MapEncoder { lengths: LengthEncoder, keys: K::Encoder, @@ -36,7 +35,6 @@ impl Buffer for MapEncoder { } } -#[derive(Debug)] pub struct MapDecoder<'a, K: Decode<'a>, V: Decode<'a>> { lengths: LengthDecoder<'a>, keys: K::Decoder, diff --git a/src/derive/option.rs b/src/derive/option.rs index 7365a9e..1432120 100644 --- a/src/derive/option.rs +++ b/src/derive/option.rs @@ -5,7 +5,6 @@ use crate::fast::{FastArrayVec, PushUnchecked}; use std::mem::MaybeUninit; use std::num::NonZeroUsize; -#[derive(Debug)] pub struct OptionEncoder { variants: VariantEncoder<2>, some: T::Encoder, @@ -85,7 +84,6 @@ impl Buffer for OptionEncoder { } } -#[derive(Debug)] pub struct OptionDecoder<'a, T: Decode<'a>> { variants: VariantDecoder<'a, 2, false>, some: T::Decoder, diff --git a/src/derive/result.rs b/src/derive/result.rs index 842acaa..bd9d6bf 100644 --- a/src/derive/result.rs +++ b/src/derive/result.rs @@ -5,7 +5,6 @@ use crate::error::Error; use std::mem::MaybeUninit; use std::num::NonZeroUsize; -#[derive(Debug)] pub struct ResultEncoder { variants: VariantEncoder<2>, ok: T::Encoder, @@ -54,7 +53,6 @@ impl Buffer for ResultEncoder { } } -#[derive(Debug)] pub struct ResultDecoder<'a, T: Decode<'a>, E: Decode<'a>> { variants: VariantDecoder<'a, 2, false>, ok: T::Decoder, diff --git a/src/derive/smart_ptr.rs b/src/derive/smart_ptr.rs index 93198c5..a15d7ed 100644 --- a/src/derive/smart_ptr.rs +++ b/src/derive/smart_ptr.rs @@ -29,7 +29,6 @@ impl Buffer for DerefEncoder { } /// Decodes a `T` and then converts it with [`From`]. For `T` -> `Box` and `Vec` -> `Box<[T]>`. -#[derive(Debug)] pub struct FromDecoder<'a, T: Decode<'a>>(T::Decoder); // Can't derive since it would bound T: Default. diff --git a/src/derive/variant.rs b/src/derive/variant.rs index cbd6128..4a31825 100644 --- a/src/derive/variant.rs +++ b/src/derive/variant.rs @@ -3,7 +3,7 @@ use crate::fast::{CowSlice, NextUnchecked, PushUnchecked, VecImpl}; use crate::pack::{pack_bytes_less_than, unpack_bytes_less_than}; use std::num::NonZeroUsize; -#[derive(Debug, Default)] +#[derive(Default)] pub struct VariantEncoder(VecImpl); impl Encoder for VariantEncoder { @@ -25,7 +25,6 @@ impl Buffer for VariantEncoder { } } -#[derive(Debug)] pub struct VariantDecoder<'a, const N: usize, const C_STYLE: bool> { variants: CowSlice<'a, u8>, histogram: [usize; N], // Not required if C_STYLE. TODO don't reserve space for it. @@ -70,12 +69,12 @@ impl<'a, const N: usize, const C_STYLE: bool> Decoder<'a, u8> for VariantDecoder #[cfg(test)] mod tests { - use crate::{decode, encode}; + use crate::{decode, encode, Decode, Encode}; #[allow(unused)] #[test] fn test_c_style_enum() { - #[derive(crate::Encode, crate::Decode)] + #[derive(Encode, Decode)] enum Enum1 { A, B, @@ -84,7 +83,7 @@ mod tests { E, F, } - #[derive(crate::Decode)] + #[derive(Decode)] enum Enum2 { A, B, @@ -101,7 +100,7 @@ mod tests { #[allow(unused)] #[test] fn test_rust_style_enum() { - #[derive(crate::Encode, crate::Decode)] + #[derive(Encode, Decode)] enum Enum1 { A(u8), B, @@ -110,7 +109,7 @@ mod tests { E, F, } - #[derive(crate::Decode)] + #[derive(Decode)] enum Enum2 { A(u8), B, @@ -124,7 +123,7 @@ mod tests { assert!(matches!(decode(&encode(&Enum1::F)), Ok(Enum1::F))); } - #[derive(Debug, PartialEq, crate::Encode, crate::Decode)] + #[derive(Debug, PartialEq, Encode, Decode)] enum BoolEnum { True, False, diff --git a/src/derive/vec.rs b/src/derive/vec.rs index c3ca164..4997814 100644 --- a/src/derive/vec.rs +++ b/src/derive/vec.rs @@ -7,7 +7,6 @@ use std::hash::{BuildHasher, Hash}; use std::mem::MaybeUninit; use std::num::NonZeroUsize; -#[derive(Debug)] pub struct VecEncoder { // pub(crate) for arrayvec.rs pub(crate) lengths: LengthEncoder, @@ -199,7 +198,6 @@ impl Encoder<[T]> for VecEncoder { } } -#[derive(Debug)] pub struct VecDecoder<'a, T: Decode<'a>> { // pub(crate) for arrayvec::ArrayVec. pub(crate) lengths: LengthDecoder<'a>, diff --git a/src/f32.rs b/src/f32.rs index 857e46b..a30533d 100644 --- a/src/f32.rs +++ b/src/f32.rs @@ -4,7 +4,7 @@ use crate::fast::{FastSlice, NextUnchecked, PushUnchecked, VecImpl}; use std::mem::MaybeUninit; use std::num::NonZeroUsize; -#[derive(Debug, Default)] +#[derive(Default)] pub struct F32Encoder(VecImpl); impl Encoder for F32Encoder { @@ -80,7 +80,7 @@ impl Buffer for F32Encoder { } } -#[derive(Debug, Default)] +#[derive(Default)] pub struct F32Decoder<'a> { // While it is true that this contains 1 bit of the exp we still call it mantissa. mantissa: FastSlice<'a, [u8; 3]>, diff --git a/src/fast.rs b/src/fast.rs index 94aca7c..53942e1 100644 --- a/src/fast.rs +++ b/src/fast.rs @@ -1,4 +1,3 @@ -use std::fmt::{Debug, Formatter}; use std::marker::PhantomData; use std::mem::{ManuallyDrop, MaybeUninit}; @@ -13,12 +12,6 @@ pub struct FastVec { _spooky: PhantomData>, } -impl Debug for FastVec { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - self.as_slice().fmt(f) - } -} - impl Default for FastVec { fn default() -> Self { Self::from(vec![]) @@ -220,12 +213,6 @@ pub struct FastSlice<'a, T> { _spooky: PhantomData<&'a T>, } -impl Debug for FastSlice<'_, T> { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - f.write_str("FastSlice") // We don't have len so we can't debug elements. - } -} - impl Default for FastSlice<'_, T> { fn default() -> Self { Self::from([].as_slice()) @@ -344,7 +331,7 @@ impl<'a, T: Copy> NextUnchecked<'a, T> for &'a [T] { } /// Maybe owned [`FastSlice`]. Saves its allocation even if borrowing something. -#[derive(Debug, Default)] +#[derive(Default)] pub struct CowSlice<'borrowed, T> { slice: SliceImpl<'borrowed, T>, // Lifetime is min of 'borrowed and &'me self. vec: Vec, diff --git a/src/int.rs b/src/int.rs index 120f614..58120ea 100644 --- a/src/int.rs +++ b/src/int.rs @@ -6,7 +6,7 @@ use bytemuck::{CheckedBitPattern, NoUninit, Pod}; use std::marker::PhantomData; use std::num::NonZeroUsize; -#[derive(Debug, Default)] +#[derive(Default)] pub struct IntEncoder(VecImpl); /// Makes IntEncoder able to encode i32/f32/char. @@ -38,7 +38,7 @@ impl Buffer for IntEncoder { } } -#[derive(Debug, Default)] +#[derive(Default)] pub struct IntDecoder<'a, T: Int>(CowSlice<'a, T::Une>); impl<'a, T: Int> IntDecoder<'a, T> { diff --git a/src/length.rs b/src/length.rs index 9708f9f..4b0c6dd 100644 --- a/src/length.rs +++ b/src/length.rs @@ -5,7 +5,7 @@ use crate::int::{IntDecoder, IntEncoder}; use crate::pack::{pack_bytes, unpack_bytes}; use std::num::NonZeroUsize; -#[derive(Debug, Default)] +#[derive(Default)] pub struct LengthEncoder { small: VecImpl, large: IntEncoder, @@ -109,7 +109,7 @@ impl Buffer for LengthEncoder { } } -#[derive(Debug, Default)] +#[derive(Default)] pub struct LengthDecoder<'a> { small: CowSlice<'a, u8>, large: IntDecoder<'a, usize>, diff --git a/src/pack_ints.rs b/src/pack_ints.rs index f3bbfba..b6c1363 100644 --- a/src/pack_ints.rs +++ b/src/pack_ints.rs @@ -477,10 +477,9 @@ fn unpack_ints_sized_unsigned<'a, T: SizedUInt>( mod tests { use super::{usize_too_big, CowSlice, Int, Result}; use crate::error::err; - use std::fmt::Debug; use test::{black_box, Bencher}; - pub fn pack_ints(ints: &[T]) -> Vec { + pub fn pack_ints(ints: &[T]) -> Vec { let mut out = vec![]; super::pack_ints(&mut ints.to_vec(), &mut out); assert_eq!(ints, unpack_ints(&out, ints.len()).unwrap()); @@ -563,7 +562,7 @@ mod tests { ); } - fn test_inner(ints: &[T]) -> Vec { + fn test_inner(ints: &[T]) -> Vec { let out = pack_ints(&mut ints.to_owned()); let unpacked = unpack_ints::(&out, ints.len()).unwrap(); assert_eq!(unpacked, ints); @@ -636,7 +635,7 @@ mod tests { assert_eq!(out.capacity(), starting_cap); } - fn bench_unpack_ints(b: &mut Bencher, src: &[T]) { + fn bench_unpack_ints(b: &mut Bencher, src: &[T]) { let packed = pack_ints(&mut src.to_vec()); let mut out = CowSlice::with_allocation(Vec::::with_capacity(src.len())); b.iter(|| { diff --git a/src/serde/de.rs b/src/serde/de.rs index 60419f7..056d8f5 100644 --- a/src/serde/de.rs +++ b/src/serde/de.rs @@ -35,7 +35,6 @@ mod inner { } pub use inner::deserialize; -#[derive(Debug)] enum SerdeDecoder<'a> { Bool(BoolDecoder<'a>), Enum((VariantDecoder<'a>, Vec>)), // (variants, values) diff --git a/src/serde/ser.rs b/src/serde/ser.rs index d543344..e72e381 100644 --- a/src/serde/ser.rs +++ b/src/serde/ser.rs @@ -53,7 +53,6 @@ mod inner { } pub use inner::serialize; -#[derive(Debug)] enum SpecifiedEncoder { Bool(BoolEncoder), Enum((VariantEncoder, Vec)), // (variants, values) @@ -110,7 +109,6 @@ impl SpecifiedEncoder { } } -#[derive(Debug)] enum LazyEncoder { Unspecified { reserved: Option, diff --git a/src/serde/variant.rs b/src/serde/variant.rs index 35651c1..1eeceea 100644 --- a/src/serde/variant.rs +++ b/src/serde/variant.rs @@ -4,7 +4,7 @@ use crate::pack::{pack_bytes, unpack_bytes}; use std::marker::PhantomData; use std::num::NonZeroUsize; -#[derive(Debug, Default)] +#[derive(Default)] pub struct VariantEncoder { data: VecImpl, } @@ -27,7 +27,7 @@ impl Buffer for VariantEncoder { } } -#[derive(Debug, Default)] +#[derive(Default)] pub struct VariantDecoder<'a> { variants: CowSlice<'a, u8>, histogram: Vec, diff --git a/src/str.rs b/src/str.rs index 9ab5c71..0beb341 100644 --- a/src/str.rs +++ b/src/str.rs @@ -8,7 +8,7 @@ use crate::u8_char::U8Char; use std::num::NonZeroUsize; use std::str::{from_utf8, from_utf8_unchecked}; -#[derive(Debug, Default)] +#[derive(Default)] pub struct StrEncoder(pub(crate) VecEncoder); // pub(crate) for arrayvec.rs #[inline(always)] @@ -70,7 +70,7 @@ impl Encoder for StrEncoder { } // Doesn't use VecDecoder because can't decode &[u8]. -#[derive(Debug, Default)] +#[derive(Default)] pub struct StrDecoder<'a> { // pub(crate) for arrayvec::ArrayString. pub(crate) lengths: LengthDecoder<'a>, diff --git a/src/u8_char.rs b/src/u8_char.rs index 557cf6c..672839e 100644 --- a/src/u8_char.rs +++ b/src/u8_char.rs @@ -4,7 +4,7 @@ use crate::fast::VecImpl; use std::num::NonZeroUsize; /// Represents a single byte of a string, unlike u8 which represents an integer. -#[derive(Copy, Clone, Debug)] +#[derive(Copy, Clone)] #[repr(transparent)] pub struct U8Char(pub u8); @@ -16,7 +16,7 @@ impl Encode for U8Char { type Encoder = U8CharEncoder; } -#[derive(Debug, Default)] +#[derive(Default)] pub struct U8CharEncoder(VecImpl); impl Encoder for U8CharEncoder {