Remove non_exhaustive annotation from structs (fixes rust-netlink#25)

jeff-hiner · Mar 22, 2023 · aa61722 · aa61722
1 parent 75ce74c
commit aa61722
Show file tree

Hide file tree

Showing 36 changed files with 3 additions and 46 deletions.
diff --git a/src/rtnl/address/message.rs b/src/rtnl/address/message.rs
@@ -9,14 +9,12 @@ use netlink_packet_utils::{
 use crate::{nlas::address::Nla, AddressMessageBuffer, ADDRESS_HEADER_LEN};
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct AddressMessage {
     pub header: AddressHeader,
     pub nlas: Vec<Nla>,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct AddressHeader {
     pub family: u8,
     pub prefix_len: u8,

diff --git a/src/rtnl/address/nlas/cache_info.rs b/src/rtnl/address/nlas/cache_info.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
-#[non_exhaustive]
 pub struct CacheInfo {
     pub ifa_preferred: i32,
     pub ifa_valid: i32,

diff --git a/src/rtnl/link/header.rs b/src/rtnl/link/header.rs
@@ -27,7 +27,6 @@ use crate::{LinkMessageBuffer, LINK_HEADER_LEN};
 ///
 /// `LinkHeader` exposes all these fields except for the "reserved" one.
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct LinkHeader {
     /// Address family: one of the `AF_*` constants.
     pub interface_family: u8,

diff --git a/src/rtnl/link/message.rs b/src/rtnl/link/message.rs
@@ -9,7 +9,6 @@ use netlink_packet_utils::{
 use crate::{nlas::link::Nla, LinkHeader, LinkMessageBuffer};
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct LinkMessage {
     pub header: LinkHeader,
     pub nlas: Vec<Nla>,

diff --git a/src/rtnl/link/nlas/af_spec_bridge.rs b/src/rtnl/link/nlas/af_spec_bridge.rs
@@ -76,7 +76,6 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for AfSpecBridge {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
-#[non_exhaustive]
 pub struct BridgeVlanInfo {
     pub flags: u16,
     pub vid: u16,

diff --git a/src/rtnl/link/nlas/inet/dev_conf.rs b/src/rtnl/link/nlas/inet/dev_conf.rs
@@ -42,7 +42,6 @@ buffer!(InetDevConfBuffer(DEV_CONF_LEN) {
 });
 
 #[derive(Clone, Copy, Eq, PartialEq, Debug)]
-#[non_exhaustive]
 pub struct InetDevConf {
     pub forwarding: i32,
     pub mc_forwarding: i32,

diff --git a/src/rtnl/link/nlas/inet6/cache.rs b/src/rtnl/link/nlas/inet6/cache.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Clone, Copy, Eq, PartialEq, Debug)]
-#[non_exhaustive]
 pub struct Inet6CacheInfo {
     pub max_reasm_len: i32,
     pub tstamp: i32,

diff --git a/src/rtnl/link/nlas/inet6/dev_conf.rs b/src/rtnl/link/nlas/inet6/dev_conf.rs
@@ -189,7 +189,6 @@ impl Emitable for Inet6DevConf {
 }
 
 #[derive(Clone, Copy, Eq, PartialEq, Debug)]
-#[non_exhaustive]
 pub struct Inet6DevConf {
     pub forwarding: i32,
     pub hoplimit: i32,

diff --git a/src/rtnl/link/nlas/inet6/icmp6_stats.rs b/src/rtnl/link/nlas/inet6/icmp6_stats.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Clone, Copy, Eq, PartialEq, Debug)]
-#[non_exhaustive]
 pub struct Icmp6Stats {
     pub num: i64,
     pub in_msgs: i64,

diff --git a/src/rtnl/link/nlas/inet6/stats.rs b/src/rtnl/link/nlas/inet6/stats.rs
@@ -46,7 +46,6 @@ buffer!(Inet6StatsBuffer(INET6_STATS_LEN) {
 });
 
 #[derive(Clone, Copy, Eq, PartialEq, Debug)]
-#[non_exhaustive]
 pub struct Inet6Stats {
     pub num: i64,
     pub in_pkts: i64,

diff --git a/src/rtnl/link/nlas/map.rs b/src/rtnl/link/nlas/map.rs
@@ -16,7 +16,6 @@ buffer!(MapBuffer(LINK_MAP_LEN) {
 });
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct Map {
     pub memory_start: u64,
     pub memory_end: u64,

diff --git a/src/rtnl/link/nlas/stats.rs b/src/rtnl/link/nlas/stats.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct Stats {
     /// total packets received
     pub rx_packets: u32,

diff --git a/src/rtnl/link/nlas/stats64.rs b/src/rtnl/link/nlas/stats64.rs
@@ -34,7 +34,6 @@ buffer!(Stats64Buffer(LINK_STATS64_LEN) {
 });
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct Stats64 {
     /// total packets received
     pub rx_packets: u64,

diff --git a/src/rtnl/neighbour/header.rs b/src/rtnl/neighbour/header.rs
@@ -22,7 +22,6 @@ use crate::{NeighbourMessageBuffer, NEIGHBOUR_HEADER_LEN};
 ///
 /// `NeighbourHeader` exposes all these fields.
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct NeighbourHeader {
     pub family: u8,
     pub ifindex: u32,

diff --git a/src/rtnl/neighbour/message.rs b/src/rtnl/neighbour/message.rs
@@ -9,7 +9,6 @@ use netlink_packet_utils::{
 use crate::{nlas::neighbour::Nla, NeighbourHeader, NeighbourMessageBuffer};
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct NeighbourMessage {
     pub header: NeighbourHeader,
     pub nlas: Vec<Nla>,

diff --git a/src/rtnl/neighbour/nlas/cache_info.rs b/src/rtnl/neighbour/nlas/cache_info.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct CacheInfo {
     pub confirmed: u32,
     pub used: u32,

diff --git a/src/rtnl/neighbour_table/header.rs b/src/rtnl/neighbour_table/header.rs
@@ -8,7 +8,6 @@ use netlink_packet_utils::{
 use super::buffer::{NeighbourTableMessageBuffer, NEIGHBOUR_TABLE_HEADER_LEN};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-#[non_exhaustive]
 pub struct NeighbourTableHeader {
     pub family: u8,
 }

diff --git a/src/rtnl/neighbour_table/message.rs b/src/rtnl/neighbour_table/message.rs
@@ -12,7 +12,6 @@ use crate::{
 };
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-#[non_exhaustive]
 pub struct NeighbourTableMessage {
     pub header: NeighbourTableHeader,
     pub nlas: Vec<Nla>,

diff --git a/src/rtnl/neighbour_table/nlas/config.rs b/src/rtnl/neighbour_table/nlas/config.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct Config {
     pub key_len: u16,
     pub entry_size: u16,

diff --git a/src/rtnl/neighbour_table/nlas/stats.rs b/src/rtnl/neighbour_table/nlas/stats.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct Stats {
     pub allocs: u64,
     pub destroys: u64,

diff --git a/src/rtnl/nsid/header.rs b/src/rtnl/nsid/header.rs
@@ -8,7 +8,6 @@ use netlink_packet_utils::{
 use super::{NsidMessageBuffer, NSID_HEADER_LEN};
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct NsidHeader {
     pub rtgen_family: u8,
 }

diff --git a/src/rtnl/nsid/message.rs b/src/rtnl/nsid/message.rs
@@ -9,7 +9,6 @@ use netlink_packet_utils::{
 use crate::{nlas::nsid::Nla, NsidHeader, NsidMessageBuffer};
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct NsidMessage {
     pub header: NsidHeader,
     pub nlas: Vec<Nla>,

diff --git a/src/rtnl/route/header.rs b/src/rtnl/route/header.rs
@@ -9,8 +9,7 @@ use crate::{constants::*, RouteMessageBuffer, ROUTE_HEADER_LEN};
 
 bitflags! {
     /// Flags that can be set in a `RTM_GETROUTE` ([`RtnlMessage::GetRoute`]) message.
-    #[non_exhaustive]
-pub struct RouteFlags: u32 {
+    pub struct RouteFlags: u32 {
         /// If the route changes, notify the user via rtnetlink
         const RTM_F_NOTIFY = RTM_F_NOTIFY;
         /// This route is cloned. Cloned routes are routes coming from the cache instead of the
@@ -84,7 +83,6 @@ impl Default for RouteFlags {
 /// }
 /// ```
 #[derive(Debug, PartialEq, Eq, Hash, Clone, Default)]
-#[non_exhaustive]
 pub struct RouteHeader {
     /// Address family of the route: either [`AF_INET`] for IPv4 prefixes, or
     /// [`AF_INET6`] for IPv6 prefixes.

diff --git a/src/rtnl/route/message.rs b/src/rtnl/route/message.rs
@@ -11,7 +11,6 @@ use netlink_packet_utils::{
 use crate::{nlas::route::Nla, RouteHeader, RouteMessageBuffer};
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct RouteMessage {
     pub header: RouteHeader,
     pub nlas: Vec<Nla>,

diff --git a/src/rtnl/route/nlas/cache_info.rs b/src/rtnl/route/nlas/cache_info.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct CacheInfo {
     pub clntref: u32,
     pub last_use: u32,

diff --git a/src/rtnl/route/nlas/mfc_stats.rs b/src/rtnl/route/nlas/mfc_stats.rs
@@ -6,7 +6,6 @@ use netlink_packet_utils::{
 };
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct MfcStats {
     pub packets: u64,
     pub bytes: u64,

diff --git a/src/rtnl/route/nlas/next_hops.rs b/src/rtnl/route/nlas/next_hops.rs
@@ -13,8 +13,7 @@ use netlink_packet_utils::{
 };
 
 bitflags! {
-    #[non_exhaustive]
-pub struct NextHopFlags: u8 {
+    pub struct NextHopFlags: u8 {
         const RTNH_F_EMPTY = 0;
         const RTNH_F_DEAD = constants::RTNH_F_DEAD;
         const RTNH_F_PERVASIVE = constants::RTNH_F_PERVASIVE;
@@ -73,7 +72,6 @@ impl<'a, T: AsRef<[u8]> + ?Sized> NextHopBuffer<&'a T> {
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]
-#[non_exhaustive]
 pub struct NextHop {
     /// Next-hop flags (see [`NextHopFlags`])
     pub flags: NextHopFlags,

diff --git a/src/rtnl/rule/header.rs b/src/rtnl/rule/header.rs
@@ -9,8 +9,7 @@ use super::{buffer::RuleMessageBuffer, RULE_HEADER_LEN};
 use crate::constants::*;
 
 bitflags! {
-    #[non_exhaustive]
-pub struct RuleFlags: u32 {
+    pub struct RuleFlags: u32 {
         const FIB_RULE_PERMANENT = FIB_RULE_PERMANENT;
         const FIB_RULE_INVERT = FIB_RULE_INVERT;
         const FIB_RULE_UNRESOLVED = FIB_RULE_UNRESOLVED;
@@ -30,7 +29,6 @@ impl Default for RuleFlags {
 // see https://github.com/torvalds/linux/blob/master/include/uapi/linux/fib_rules.h
 // see https://github.com/torvalds/linux/blob/master/include/net/fib_rules.h
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct RuleHeader {
     /// Address family: one of the `AF_*` constants.
     pub family: u8,

diff --git a/src/rtnl/rule/message.rs b/src/rtnl/rule/message.rs
@@ -9,7 +9,6 @@ use netlink_packet_utils::{
 use super::{buffer::RuleMessageBuffer, header::RuleHeader, nlas::Nla};
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct RuleMessage {
     pub header: RuleHeader,
     pub nlas: Vec<Nla>,

diff --git a/src/rtnl/tc/message.rs b/src/rtnl/tc/message.rs
@@ -15,7 +15,6 @@ use crate::{
 };
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct TcMessage {
     pub header: TcHeader,
     pub nlas: Vec<Nla>,
@@ -43,7 +42,6 @@ impl TcMessage {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct TcHeader {
     pub family: u8,
     // Interface index

diff --git a/src/rtnl/tc/nlas/action/mirred.rs b/src/rtnl/tc/nlas/action/mirred.rs
@@ -73,7 +73,6 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for Nla {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct TcMirred {
     pub index: u32,
     pub capab: u32,

diff --git a/src/rtnl/tc/nlas/action/mod.rs b/src/rtnl/tc/nlas/action/mod.rs
@@ -17,7 +17,6 @@ use crate::tc::{constants::*, Stats2};
 pub const TC_GEN_BUF_LEN: usize = 20;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-#[non_exhaustive]
 pub struct Action {
     pub tab: u16,
     pub nlas: Vec<ActNla>,
@@ -213,7 +212,6 @@ where
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct TcGen {
     pub index: u32,
     pub capab: u32,

diff --git a/src/rtnl/tc/nlas/filter/u32.rs b/src/rtnl/tc/nlas/filter/u32.rs
@@ -137,7 +137,6 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for Nla {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct Sel {
     pub flags: u8,
     pub offshift: u8,
@@ -219,7 +218,6 @@ impl<T: AsRef<[u8]> + ?Sized> Parseable<SelBuffer<&T>> for Sel {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-#[non_exhaustive]
 pub struct Key {
     pub mask: u32,
     pub val: u32,

diff --git a/src/rtnl/tc/nlas/stats.rs b/src/rtnl/tc/nlas/stats.rs
@@ -7,7 +7,6 @@ use netlink_packet_utils::{
 
 /// Generic queue statistics
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-#[non_exhaustive]
 pub struct Stats {
     /// Number of enqueued bytes
     pub bytes: u64,

diff --git a/src/rtnl/tc/nlas/stats_basic.rs b/src/rtnl/tc/nlas/stats_basic.rs
@@ -7,7 +7,6 @@ use netlink_packet_utils::{
 
 /// Byte/Packet throughput statistics
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-#[non_exhaustive]
 pub struct StatsBasic {
     /// number of seen bytes
     pub bytes: u64,

diff --git a/src/rtnl/tc/nlas/stats_queue.rs b/src/rtnl/tc/nlas/stats_queue.rs
@@ -7,7 +7,6 @@ use netlink_packet_utils::{
 
 /// Queuing statistics
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-#[non_exhaustive]
 pub struct StatsQueue {
     /// queue length
     pub qlen: u32,