deps: update bitflags to 2.0.0

Author: phip1611

Cargo.lock

@@ -24,7 +24,7 @@ panic-on-logger-errors = []
 unstable = []
 
 [dependencies]
-bitflags = "1.3.1"
+bitflags = "2.0.1"
 log = { version = "0.4.5", default-features = false }
 ptr_meta = { version = "0.2.0", default-features = false }
 ucs2 = "0.3.2"

uefi/Cargo.toml

@@ -156,6 +156,7 @@ bitflags! {
     /// The control bits of a device. These are defined in the [RS-232] standard.
     ///
     /// [RS-232]: https://en.wikipedia.org/wiki/RS-232
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct ControlBits: u32 {
         /// Clear to send
         const CLEAR_TO_SEND = 0x10;
@@ -185,11 +186,11 @@ bitflags! {
         ///
         /// Up to date as of UEFI 2.7 / Serial protocol v1
         const SETTABLE =
-            ControlBits::DATA_TERMINAL_READY.bits
-            | ControlBits::REQUEST_TO_SEND.bits
-            | ControlBits::HARDWARE_LOOPBACK_ENABLE.bits
-            | ControlBits::SOFTWARE_LOOPBACK_ENABLE.bits
-            | ControlBits::HARDWARE_FLOW_CONTROL_ENABLE.bits;
+            ControlBits::DATA_TERMINAL_READY.bits()
+            | ControlBits::REQUEST_TO_SEND.bits()
+            | ControlBits::HARDWARE_LOOPBACK_ENABLE.bits()
+            | ControlBits::SOFTWARE_LOOPBACK_ENABLE.bits()
+            | ControlBits::HARDWARE_FLOW_CONTROL_ENABLE.bits();
     }
 }
 

uefi/src/proto/console/serial.rs

@@ -2401,7 +2401,7 @@ pub mod messaging {
 
     }
 
-    bitflags! { # [doc = " Flags to identify/manage InfiniBand elements."] # [repr (transparent)] pub struct InfinibandResourceFlags : u32 { # [doc = " Set = service, unset = IOC."] const SERVICE = 0x0000_0001 ; # [doc = " Extended boot environment."] const EXTENDED_BOOT_ENVIRONMENT = 0x0000_0002 ; # [doc = " Console protocol."] const CONSOLE_PROTOCOL = 0x0000_0004 ; # [doc = " Storage protocol."] const STORAGE_PROTOCOL = 0x0000_0008 ; # [doc = " Network protocol."] const NETWORK_PROTOCOL = 0x0000_0010 ; }
+    bitflags! { # [doc = " Flags to identify/manage InfiniBand elements."] # [derive (Clone , Copy , Debug , Default , PartialEq , Eq , PartialOrd , Ord)] # [repr (transparent)] pub struct InfinibandResourceFlags : u32 { # [doc = " Set = service, unset = IOC."] const SERVICE = 0x0000_0001 ; # [doc = " Extended boot environment."] const EXTENDED_BOOT_ENVIRONMENT = 0x0000_0002 ; # [doc = " Console protocol."] const CONSOLE_PROTOCOL = 0x0000_0004 ; # [doc = " Storage protocol."] const STORAGE_PROTOCOL = 0x0000_0008 ; # [doc = " Network protocol."] const NETWORK_PROTOCOL = 0x0000_0010 ; }
 
     }
 
@@ -2417,7 +2417,7 @@ pub mod messaging {
 
     }
 
-    bitflags! { # [doc = " iSCSI login options."] # [repr (transparent)] pub struct IscsiLoginOptions : u16 { # [doc = " Header digest using CRC32. If not set, no header digest."] const HEADER_DIGEST_USING_CRC32 = 0x0002 ; # [doc = " Data digest using CRC32. If not set, no data digest."] const DATA_DIGEST_USING_CRC32 = 0x0008 ; # [doc = " Auth method none. If not set, auth method CHAP."] const AUTH_METHOD_NONE = 0x0800 ; # [doc = " CHAP UNI. If not set, CHAP BI."] const CHAP_UNI = 0x1000 ; }
+    bitflags! { # [doc = " iSCSI login options."] # [derive (Clone , Copy , Debug , Default , PartialEq , Eq , PartialOrd , Ord)] # [repr (transparent)] pub struct IscsiLoginOptions : u16 { # [doc = " Header digest using CRC32. If not set, no header digest."] const HEADER_DIGEST_USING_CRC32 = 0x0002 ; # [doc = " Data digest using CRC32. If not set, no data digest."] const DATA_DIGEST_USING_CRC32 = 0x0008 ; # [doc = " Auth method none. If not set, auth method CHAP."] const AUTH_METHOD_NONE = 0x0800 ; # [doc = " CHAP UNI. If not set, CHAP BI."] const CHAP_UNI = 0x1000 ; }
 
     }
 

uefi/src/proto/device_path/device_path_gen.rs

@@ -394,6 +394,7 @@ pub enum FileMode {
 
 bitflags! {
     /// Attributes describing the properties of a file on the file system.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     #[repr(transparent)]
     pub struct FileAttribute: u64 {
         /// File can only be opened in [`FileMode::READ`] mode.

uefi/src/proto/media/file/mod.rs

@@ -76,7 +76,8 @@ bitflags! {
     /// * Bits `48..=63`: See
     /// [`type_specific_bits`][Self::type_specific_bits] and
     /// [`RESERVED_FOR_PARTITION_TYPE`][Self::RESERVED_FOR_PARTITION_TYPE].
-    #[derive(Default)]
+
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     #[repr(transparent)]
     pub struct GptPartitionAttributes: u64 {
         /// Partition is required for the platform to function.
@@ -103,7 +104,7 @@ impl GptPartitionAttributes {
     /// on the partition's type (see [`GptPartitionEntry::partition_type_guid`]).
     #[must_use]
     pub const fn type_specific_bits(&self) -> u16 {
-        (self.bits >> 48) as u16
+        (self.bits() >> 48) as u16
     }
 }
 

uefi/src/proto/media/partition.rs

@@ -846,6 +846,7 @@ pub struct MtftpInfo {
 // No corresponding type in the UEFI spec, it just uses UINT16.
 bitflags! {
     /// Flags for UDP read and write operations.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     #[repr(transparent)]
     pub struct UdpOpFlags: u16 {
         /// Receive a packet sent from any IP address in UDP read operations.
@@ -910,6 +911,7 @@ impl IpFilter {
 
 bitflags! {
     /// IP receive filters.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     #[repr(transparent)]
     pub struct IpFilters: u8 {
         /// Enable the Station IP address.
@@ -1025,6 +1027,7 @@ impl DhcpV4Packet {
 
 bitflags! {
     /// Represents the 'flags' field for a [`DhcpV4Packet`].
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct DhcpV4Flags: u16 {
         /// Should be set when the client cannot receive unicast IP datagrams
         /// until its protocol software has been configured with an IP address.

uefi/src/proto/network/pxe.rs

@@ -124,15 +124,15 @@ impl SimpleNetwork {
         if let Some(mcast_filter) = mcast_filter {
             (self.receive_filters)(
                 self,
-                enable.bits,
-                disable.bits,
+                enable.bits(),
+                disable.bits(),
                 reset_mcast_filter,
                 mcast_filter.len(),
                 NonNull::new(mcast_filter.as_ptr() as *mut _),
             )
             .into()
         } else {
-            (self.receive_filters)(self, enable.bits, disable.bits, reset_mcast_filter, 0, None)
+            (self.receive_filters)(self, enable.bits(), disable.bits(), reset_mcast_filter, 0, None)
                 .into()
         }
     }
@@ -271,6 +271,7 @@ impl SimpleNetwork {
 
 bitflags! {
     /// Flags to pass to receive_filters to enable/disable reception of some kinds of packets.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct ReceiveFlags : u32 {
         /// Receive unicast packets.
         const UNICAST = 0x01;
@@ -288,6 +289,7 @@ bitflags! {
 bitflags! {
     /// Flags returned by get_interrupt_status to indicate which interrupts have fired on the
     /// interface since the last call.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct InterruptStatus : u32 {
         /// Packet received.
         const RECEIVE = 0x01;

uefi/src/proto/network/snp.rs

@@ -25,7 +25,7 @@ bitflags! {
     /// Flags indicating if the processor is BSP or AP,
     /// if the processor is enabled or disabled, and if
     /// the processor is healthy.
-    #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     struct StatusFlag: u32 {
         /// Processor is playing the role of BSP.
         const PROCESSOR_AS_BSP_BIT = 1;

uefi/src/proto/pi/mp.rs

@@ -28,7 +28,7 @@ bitflags! {
     /// Hash algorithms the protocol can provide.
     ///
     /// The [`v1`] protocol only supports SHA1.
-    #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     #[repr(transparent)]
     pub struct HashAlgorithm: u32 {
         /// SHA-1 hash.

uefi/src/proto/tcg/mod.rs

@@ -16,7 +16,7 @@ use crate::util::{ptr_write_unaligned_and_add, usize_from_u32};
 use crate::{Error, Result, Status};
 use core::fmt::{self, Debug, Formatter};
 use core::marker::{PhantomData, PhantomPinned};
-use core::mem::{self, MaybeUninit};
+use core::mem::{self, MaybeUninit, transmute};
 use core::ptr;
 use ptr_meta::Pointee;
 
@@ -60,7 +60,7 @@ impl BootServiceCapability {
     pub fn hash_algorithm(&self) -> HashAlgorithm {
         // Safety: the value should always be 0x1 (indicating SHA-1), but
         // we don't care if it's some unexpected value.
-        unsafe { HashAlgorithm::from_bits_unchecked(u32::from(self.hash_algorithm_bitmap)) }
+        unsafe { transmute(self.hash_algorithm_bitmap as u32) }
     }
 
     /// Whether the TPM device is present.

uefi/src/proto/tcg/v1.rs

@@ -38,7 +38,7 @@ bitflags! {
     /// Event log formats supported by the firmware.
     ///
     /// Corresponds to the C typedef `EFI_TCG2_EVENT_ALGORITHM_BITMAP`.
-    #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     #[repr(transparent)]
     pub struct EventLogFormat: u32 {
         /// Firmware supports the SHA-1 log format.
@@ -125,7 +125,7 @@ impl BootServiceCapability {
 
 bitflags! {
     /// Flags for the [`Tcg::hash_log_extend_event`] function.
-    #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     #[repr(transparent)]
     pub struct HashLogExtendEventFlags: u64 {
         /// Extend an event but don't log it.

uefi/src/proto/tcg/v2.rs

@@ -1933,6 +1933,7 @@ impl Align for MemoryDescriptor {
 
 bitflags! {
     /// Flags describing the capabilities of a memory range.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct MemoryAttribute: u64 {
         /// Supports marking as uncacheable.
         const UNCACHEABLE = 0x1;
@@ -2169,6 +2170,7 @@ impl<'guid> SearchType<'guid> {
 
 bitflags! {
     /// Flags describing the type of an UEFI event and its attributes.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct EventType: u32 {
         /// The event is a timer event and may be passed to `BootServices::set_timer()`
         /// Note that timers only function during boot services time.

uefi/src/table/boot.rs

@@ -60,6 +60,7 @@ pub struct PropertiesTable {
 
 bitflags! {
     /// Flags describing memory protection.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct MemoryProtectionAttribute: usize {
         /// If this bit is set, then the UEFI implementation will mark pages
         /// containing data as non-executable.

uefi/src/table/cfg.rs

@@ -365,6 +365,7 @@ pub struct TimeParams {
 
 bitflags! {
     /// A bitmask containing daylight savings time information.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct Daylight: u8 {
         /// Time is affected by daylight savings time.
         const ADJUST_DAYLIGHT = 0x01;
@@ -581,6 +582,7 @@ pub struct TimeCapabilities {
 
 bitflags! {
     /// Flags describing the attributes of a variable.
+    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
     pub struct VariableAttributes: u32 {
         /// Variable is maintained across a power cycle.
         const NON_VOLATILE = 0x01;

uefi/src/table/runtime.rs

@@ -598,6 +598,7 @@ mod messaging {
 
     bitflags! {
         /// Flags to identify/manage InfiniBand elements.
+        #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
         #[repr(transparent)]
         pub struct InfinibandResourceFlags: u32 {
             /// Set = service, unset = IOC.
@@ -742,6 +743,7 @@ mod messaging {
 
     bitflags! {
         /// iSCSI login options.
+        #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
         #[repr(transparent)]
         pub struct IscsiLoginOptions: u16 {
             /// Header digest using CRC32. If not set, no header digest.