Assorted cleanup

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 env:
   CARGO_TERM_COLOR: always

Cargo.toml

@@ -32,7 +32,7 @@ pnet_transport = { path = "pnet_transport", version = "0.33.0", optional = true,
 pnet_packet = { path = "pnet_packet", version = "0.33.0", default-features = false }
 
 [dev-dependencies]
-time = "0.3.17"
+time = "0.3.23"
 
 [[example]]
 name = "arp_packet"

pnet_base/Cargo.toml

@@ -13,10 +13,10 @@ edition = "2021"
 
 [dependencies]
 no-std-net = { version = "0.6.0", default-features = false }
-serde = { version = "1.0.152", optional = true, default-features = false }
+serde = { version = "1.0.171", optional = true, default-features = false }
 
 [dev-dependencies]
-serde_test = "1.0.152"
+serde_test = "1.0.171"
 
 [features]
 std = ["no-std-net/std"]

pnet_base/src/lib.rs

@@ -6,6 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![deny(warnings)]
+
 #![cfg_attr(all(not(test), not(feature = "std")), no_std)]
 
 #[cfg(feature = "serde")]

pnet_datalink/Cargo.toml

@@ -17,14 +17,14 @@ std = ["pnet_base/std"]
 default = ["std"]
 
 [dependencies]
-libc = "0.2.139"
+libc = "0.2.147"
 ipnetwork = "0.20.0"
 pnet_base = { path = "../pnet_base", version = "0.33.0", default-features = false }
 pnet_sys = { path = "../pnet_sys", version = "0.33.0" }
 
-pcap = { version = "1.0.0", optional = true }
+pcap = { version = "1.1.0", optional = true }
 netmap_sys = { version = "0.1.4", optional = true, features = ["netmap_with_libs"] }
-serde = { version = "1.0.152", optional = true, default-features = false, features = [ "derive" ] }
+serde = { version = "1.0.171", optional = true, default-features = false, features = [ "derive" ] }
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3.9"

pnet_datalink/src/lib.rs

@@ -8,6 +8,8 @@
 
 //! Support for sending and receiving data link layer packets.
 
+#![deny(warnings)]
+
 extern crate ipnetwork;
 extern crate libc;
 extern crate pnet_base;

pnet_macros/Cargo.toml

@@ -20,10 +20,10 @@ travis = []
 
 [dev-dependencies]
 pnet_macros_support = { path = "../pnet_macros_support", version = "0.33.0" }
-trybuild = "1.0.77"
+trybuild = "1.0.81"
 
 [dependencies]
-proc-macro2 = "1.0.50"
-quote = "1.0.23"
-syn = { version = "2.0.25", features = ["full"] }
-regex = "1.7.1"
+proc-macro2 = "1.0.66"
+quote = "1.0.31"
+syn = { version = "2.0.26", features = ["full"] }
+regex = "1.9.1"

pnet_macros/src/lib.rs

@@ -136,9 +136,7 @@
 //!        `#[construct_with(...)]` attribute, and in the `new` method.
 
 #![deny(missing_docs)]
-// #![cfg_attr(feature = "clippy", feature(plugin))]
-// #![cfg_attr(feature = "clippy", plugin(clippy))]
-// #![cfg_attr(feature = "clippy", allow(let_and_return))]
+#![deny(warnings)]
 
 use proc_macro::TokenStream;
 use quote::quote;

pnet_macros_support/src/lib.rs

@@ -11,6 +11,7 @@
 //! This exists to remove the need for the plugin_as_library feature, and allow for static linking.
 
 #![deny(missing_docs)]
+#![deny(warnings)]
 #![no_std]
 
 extern crate pnet_base;

pnet_macros_support/src/packet.rs

@@ -39,12 +39,12 @@ impl<T: Packet> Packet for alloc::boxed::Box<T> {
 impl<T: Packet> Packet for &T {
     /// Retrieve the underlying buffer for the packet.
     fn packet(&self) -> &[u8] {
-        self.deref().packet()
+        (*self).packet()
     }
 
     /// Retrieve the payload for the packet.
     fn payload(&self) -> &[u8] {
-        self.deref().payload()
+        (*self).payload()
     }
 }
 

pnet_packet/Cargo.toml

@@ -22,7 +22,7 @@ default = ["std"]
 
 [dev-dependencies]
 hex = "0.4.3"
-criterion = { version = "0.4.0", features = ["html_reports"] } #added HTML feature becuase of the annoying warnings when running the tests
+criterion = { version = "0.5.1", features = ["html_reports"] } #added HTML feature becuase of the annoying warnings when running the tests
 
 [build-dependencies]
 glob = "0.3.1"

pnet_packet/src/lib.rs

@@ -8,6 +8,7 @@
 
 //! Provides interfaces for interacting with packets and headers.
 #![allow(missing_docs)]
+#![deny(warnings)]
 #![no_std]
 #![macro_use]
 

pnet_packet/src/sll2.rs

@@ -15,7 +15,7 @@ pub struct SLL2 {
     pub protocol_type: EtherType,
 
     #[construct_with(u16)]
-    pub reserverd: u16be,
+    pub reserved: u16be,
 
     #[construct_with(u32)]
     pub interface_index: u32be,

pnet_sys/Cargo.toml

@@ -12,7 +12,7 @@ categories = ["network-programming"]
 edition = "2021"
 
 [dependencies]
-libc = "0.2.139"
+libc = "0.2.147"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.9", features = [ "winsock2", "ws2ipdef" ] }

pnet_sys/src/lib.rs

@@ -6,6 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![deny(warnings)]
 extern crate libc;
 
 use std::io;

pnet_sys/src/windows.rs

@@ -71,7 +71,7 @@ pub mod public {
 
     pub fn make_in6_addr(segments: [u16; 8]) -> In6Addr {
         unsafe {
-            let mut val: In6Addr = mem::MaybeUninit::uninit().assume_init();
+            let mut val: In6Addr = mem::zeroed();
             *val.u.Word_mut() = [
                 htons(segments[0]),
                 htons(segments[1]),
@@ -188,7 +188,7 @@ pub fn ipv4_addr(addr: InAddr) -> u32 {
 #[inline(always)]
 pub fn mk_inaddr(addr: u32) -> InAddr {
     unsafe {
-        let mut val: InAddr = mem::MaybeUninit::uninit().assume_init();
+        let mut val: InAddr = mem::zeroed();
         *val.S_un.S_addr_mut() = addr as minwindef::ULONG;
 
         val

pnet_transport/Cargo.toml

@@ -12,7 +12,7 @@ categories = ["network-programming"]
 edition = "2021"
 
 [dependencies]
-libc = "0.2.139"
+libc = "0.2.147"
 pnet_base = { path = "../pnet_base", version = "0.33.0", default-features = false }
 pnet_sys = { path = "../pnet_sys", version = "0.33.0" }
 pnet_packet = { path = "../pnet_packet", version = "0.33.0" }

pnet_transport/src/lib.rs

@@ -16,6 +16,7 @@
 //! X and FreeBSD, it is impossible to implement protocols which are already
 //! implemented in the kernel such as TCP and UDP.
 
+#![deny(warnings)]
 #![macro_use]
 
 extern crate libc;
@@ -34,10 +35,12 @@ use pnet_packet::Packet;
 
 use std::io;
 use std::io::Error;
+#[cfg(unix)]
 use std::io::ErrorKind;
 use std::mem;
 use std::net::{self, IpAddr};
 use std::sync::Arc;
+#[cfg(unix)]
 use std::time::Duration;
 
 /// Represents a transport layer protocol.

src/lib.rs

@@ -7,6 +7,8 @@
 // except according to those terms.
 
 #![deny(missing_docs)]
+#![deny(warnings)]
+
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "nightly", feature(custom_attribute, plugin))]
 #![cfg_attr(feature = "nightly", plugin(pnet_macros_plugin))]
@@ -15,7 +17,6 @@
 #![cfg_attr(feature = "clippy", plugin(clippy))]
 // We can't implement Iterator since we use streaming iterators
 #![cfg_attr(feature = "clippy", allow(should_implement_trait))]
-#![cfg_attr(any(feature = "appveyor", feature = "travis"), deny(warnings))]
 
 //! # libpnet
 //!