Clean up code and lint with clippy.

bin-proto-derive/Cargo.toml

@@ -10,9 +10,11 @@ rust-version = "1.63.0"
 
 description = "Derive macros for bin-proto"
 license = "MIT"
+readme = "../README.md"
 repository = "https://github.com/wojciech-graj/bin-proto"
 documentation = "https://docs.rs/bin-proto"
 keywords = ["protocol", "binary", "bit", "codec", "serde"]
+categories = ["encoding", "parsing"]
 
 [lib]
 proc-macro = true

bin-proto-derive/src/attr.rs

@@ -39,10 +39,10 @@ pub enum AttrKind {
 impl fmt::Display for AttrKind {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            AttrKind::Enum => write!(f, "enum"),
-            AttrKind::Struct => write!(f, "struct"),
-            AttrKind::Variant => write!(f, "variant"),
-            AttrKind::Field => write!(f, "field"),
+            Self::Enum => write!(f, "enum"),
+            Self::Struct => write!(f, "struct"),
+            Self::Variant => write!(f, "variant"),
+            Self::Field => write!(f, "field"),
         }
     }
 }
@@ -69,9 +69,9 @@ impl Attrs {
         }
     }
 
-    #[allow(clippy::too_many_lines)]
+    #[allow(clippy::too_many_lines, clippy::cognitive_complexity)]
     pub fn parse(attrs: &[syn::Attribute], kind: Option<AttrKind>, span: Span) -> Result<Self> {
-        let mut attribs = Attrs::default();
+        let mut attribs = Self::default();
 
         let mut tag = None;
         let mut tag_type = None;

bin-proto-derive/src/lib.rs

@@ -1,5 +1,5 @@
-#![deny(clippy::pedantic)]
-#![allow(clippy::module_name_repetitions)]
+#![deny(clippy::pedantic, clippy::nursery, clippy::cargo)]
+#![allow(clippy::module_name_repetitions, clippy::option_if_let_else)]
 
 #[macro_use]
 extern crate quote;

bin-proto-derive/src/plan.rs

@@ -30,9 +30,9 @@ impl Enum {
 
                     let discriminant_value = match variant.discriminant.as_ref().map(|a| &a.1) {
                         Some(expr_lit) => expr_lit.clone(),
-                        None => attrs
-                            .discriminant
-                            .ok_or(Error::new(variant.span(), "No discriminant for variant"))?,
+                        None => attrs.discriminant.ok_or_else(|| {
+                            Error::new(variant.span(), "No discriminant for variant")
+                        })?,
                     };
 
                     let variant = EnumVariant {

bin-proto/Cargo.toml

@@ -14,6 +14,7 @@ readme = "../README.md"
 repository = "https://github.com/wojciech-graj/bin-proto"
 documentation = "https://docs.rs/bin-proto"
 keywords = ["protocol", "binary", "bit", "codec", "serde"]
+categories = ["encoding", "parsing"]
 
 [package.metadata.docs.rs]
 all-features = true

bin-proto/src/lib.rs

@@ -56,7 +56,7 @@
 //! ```
 
 #![cfg_attr(docsrs, feature(doc_cfg))]
-#![deny(clippy::pedantic)]
+#![deny(clippy::pedantic, clippy::nursery, clippy::cargo)]
 #![allow(
     clippy::module_name_repetitions,
     clippy::missing_errors_doc,
@@ -314,15 +314,15 @@ pub use bin_proto_derive::{ProtocolRead, ProtocolWrite};
 mod bit_field;
 mod bit_read;
 mod bit_write;
-#[macro_use]
-mod tagged;
 mod byte_order;
+mod discriminable;
 mod error;
 mod flexible_array_member;
-mod types;
 #[macro_use]
 mod protocol;
-mod discriminable;
+#[macro_use]
+mod tagged;
+mod types;
 mod util;
 
 pub extern crate bitstream_io;

bin-proto/src/types/cstring.rs

@@ -7,7 +7,7 @@ impl<Ctx> ProtocolRead<Ctx> for CString {
         loop {
             let c: u8 = ProtocolRead::read(read, byte_order, ctx)?;
             if c == 0x00 {
-                return Ok(CString::new(result)?);
+                return Ok(Self::new(result)?);
             }
             result.push(c);
         }

bin-proto/src/types/marker.rs

@@ -3,7 +3,7 @@ use std::marker::{PhantomData, PhantomPinned};
 
 impl<Ctx, T> ProtocolRead<Ctx> for PhantomData<T> {
     fn read(_: &mut dyn BitRead, _: ByteOrder, _: &mut Ctx) -> Result<Self> {
-        Ok(PhantomData)
+        Ok(Self)
     }
 }
 
@@ -15,7 +15,7 @@ impl<Ctx, T> ProtocolWrite<Ctx> for PhantomData<T> {
 
 impl<Ctx> ProtocolRead<Ctx> for PhantomPinned {
     fn read(_: &mut dyn BitRead, _: ByteOrder, _: &mut Ctx) -> Result<Self> {
-        Ok(PhantomPinned)
+        Ok(Self)
     }
 }
 

bin-proto/src/types/mod.rs

@@ -1,8 +1,9 @@
 //! Utility types
 
 mod array;
-mod collections;
 mod cstring;
+mod list;
+mod map;
 mod marker;
 mod net;
 mod numerics;

bin-proto/src/types/string.rs

@@ -20,7 +20,7 @@ where
             ctx,
         )?;
 
-        Ok(String::from_utf8(bytes)?)
+        Ok(Self::from_utf8(bytes)?)
     }
 }
 
@@ -34,7 +34,7 @@ impl<Ctx> UntaggedWrite<Ctx> for String {
 impl<Ctx> FlexibleArrayMemberRead<Ctx> for String {
     fn read(read: &mut dyn BitRead, byte_order: ByteOrder, ctx: &mut Ctx) -> Result<Self> {
         let bytes = util::read_items_to_eof(read, byte_order, ctx)?;
-        Ok(String::from_utf8(bytes)?)
+        Ok(Self::from_utf8(bytes)?)
     }
 }