From e24d8111febac1a375dcb82491a5c3efcf8b5612 Mon Sep 17 00:00:00 2001 From: Tom Dohrmann Date: Sun, 14 Jan 2024 16:04:46 +0000 Subject: [PATCH] remove deprecated from_bits_unchecked functions --- src/registers/control.rs | 24 ------------------------ src/registers/debug.rs | 12 ------------ src/registers/model_specific.rs | 16 ---------------- src/registers/mxcsr.rs | 8 -------- src/registers/rflags.rs | 8 -------- src/registers/xcontrol.rs | 8 -------- src/structures/gdt.rs | 6 ------ src/structures/idt.rs | 8 -------- src/structures/paging/page_table.rs | 8 -------- 9 files changed, 98 deletions(-) diff --git a/src/registers/control.rs b/src/registers/control.rs index eec587b3..4056bfea 100644 --- a/src/registers/control.rs +++ b/src/registers/control.rs @@ -51,14 +51,6 @@ bitflags! { } } -impl Cr0Flags { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - /// Contains the Page Fault Linear Address (PFLA). /// /// When a page fault occurs, the CPU sets this register to the faulting virtual address. @@ -82,14 +74,6 @@ bitflags! { } } -impl Cr3Flags { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - /// Contains various control flags that enable architectural extensions, and /// indicate support for specific processor capabilities. #[derive(Debug)] @@ -175,14 +159,6 @@ bitflags! { } } -impl Cr4Flags { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - #[cfg(feature = "instructions")] mod x86_64 { use super::*; diff --git a/src/registers/debug.rs b/src/registers/debug.rs index f7011974..068b2ee5 100644 --- a/src/registers/debug.rs +++ b/src/registers/debug.rs @@ -160,12 +160,6 @@ impl Dr6Flags { DebugAddressRegisterNumber::Dr3 => Self::TRAP3, } } - - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } } bitflags! { @@ -239,12 +233,6 @@ impl Dr7Flags { DebugAddressRegisterNumber::Dr3 => Self::GLOBAL_BREAKPOINT_3_ENABLE, } } - - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } } /// The condition for a hardware breakpoint. diff --git a/src/registers/model_specific.rs b/src/registers/model_specific.rs index 0a60b847..18d98bcd 100644 --- a/src/registers/model_specific.rs +++ b/src/registers/model_specific.rs @@ -132,14 +132,6 @@ bitflags! { } } -impl EferFlags { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - bitflags! { /// Flags stored in IA32_U_CET and IA32_S_CET (Table-2-2 in Intel SDM Volume /// 4). The Intel SDM-equivalent names are described in parentheses. @@ -165,14 +157,6 @@ bitflags! { } } -impl CetFlags { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - #[cfg(feature = "instructions")] mod x86_64 { use super::*; diff --git a/src/registers/mxcsr.rs b/src/registers/mxcsr.rs index 55e05cc5..19db2741 100644 --- a/src/registers/mxcsr.rs +++ b/src/registers/mxcsr.rs @@ -60,14 +60,6 @@ impl Default for MxCsr { } } -impl MxCsr { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u32) -> Self { - Self::from_bits_retain(bits) - } -} - #[cfg(feature = "instructions")] mod x86_64 { use super::*; diff --git a/src/registers/rflags.rs b/src/registers/rflags.rs index c0f9510a..921bb8f2 100644 --- a/src/registers/rflags.rs +++ b/src/registers/rflags.rs @@ -64,14 +64,6 @@ bitflags! { } } -impl RFlags { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - #[cfg(feature = "instructions")] mod x86_64 { use super::*; diff --git a/src/registers/xcontrol.rs b/src/registers/xcontrol.rs index ebb1d617..09087a43 100644 --- a/src/registers/xcontrol.rs +++ b/src/registers/xcontrol.rs @@ -50,14 +50,6 @@ bitflags! { } } -impl XCr0Flags { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - #[cfg(feature = "instructions")] mod x86_64 { use super::*; diff --git a/src/structures/gdt.rs b/src/structures/gdt.rs index d56e5793..701c7a1d 100644 --- a/src/structures/gdt.rs +++ b/src/structures/gdt.rs @@ -357,12 +357,6 @@ impl DescriptorFlags { /// A 64-bit user code segment pub const USER_CODE64: Self = Self::from_bits_truncate(Self::KERNEL_CODE64.bits() | Self::DPL_RING_3.bits()); - - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } } impl Descriptor { diff --git a/src/structures/idt.rs b/src/structures/idt.rs index 5ec0d84d..5505afe3 100644 --- a/src/structures/idt.rs +++ b/src/structures/idt.rs @@ -1115,14 +1115,6 @@ bitflags! { } } -impl PageFaultErrorCode { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - /// Describes an error code referencing a segment selector. #[derive(Clone, Copy, PartialEq, Eq, Hash)] #[repr(transparent)] diff --git a/src/structures/paging/page_table.rs b/src/structures/paging/page_table.rs index 0af5350e..03203ed5 100644 --- a/src/structures/paging/page_table.rs +++ b/src/structures/paging/page_table.rs @@ -169,14 +169,6 @@ bitflags! { } } -impl PageTableFlags { - #[deprecated = "use the safe `from_bits_retain` method instead"] - /// Convert from underlying bit representation, preserving all bits (even those not corresponding to a defined flag). - pub const unsafe fn from_bits_unchecked(bits: u64) -> Self { - Self::from_bits_retain(bits) - } -} - /// The number of entries in a page table. const ENTRY_COUNT: usize = 512;