Merge pull request #130 from AntoineSebert/master

Fix clippy warnings

Author: phil-opp

src/instructions/port.rs

@@ -118,7 +118,7 @@ impl<T: PortRead> PortReadOnly<T> {
     #[cfg(feature = "const_fn")]
     pub const fn new(port: u16) -> PortReadOnly<T> {
         PortReadOnly {
-            port: port,
+            port,
             phantom: PhantomData,
         }
     }
@@ -127,7 +127,7 @@ impl<T: PortRead> PortReadOnly<T> {
     #[cfg(not(feature = "const_fn"))]
     pub fn new(port: u16) -> PortReadOnly<T> {
         PortReadOnly {
-            port: port,
+            port,
             phantom: PhantomData,
         }
     }
@@ -147,7 +147,7 @@ impl<T: PortWrite> PortWriteOnly<T> {
     #[cfg(feature = "const_fn")]
     pub const fn new(port: u16) -> PortWriteOnly<T> {
         PortWriteOnly {
-            port: port,
+            port,
             phantom: PhantomData,
         }
     }
@@ -156,7 +156,7 @@ impl<T: PortWrite> PortWriteOnly<T> {
     #[cfg(not(feature = "const_fn"))]
     pub fn new(port: u16) -> PortWriteOnly<T> {
         PortWriteOnly {
-            port: port,
+            port,
             phantom: PhantomData,
         }
     }
@@ -176,7 +176,7 @@ impl<T: PortReadWrite> Port<T> {
     #[cfg(feature = "const_fn")]
     pub const fn new(port: u16) -> Port<T> {
         Port {
-            port: port,
+            port,
             phantom: PhantomData,
         }
     }
@@ -185,7 +185,7 @@ impl<T: PortReadWrite> Port<T> {
     #[cfg(not(feature = "const_fn"))]
     pub fn new(port: u16) -> Port<T> {
         Port {
-            port: port,
+            port,
             phantom: PhantomData,
         }
     }

src/registers/control.rs

@@ -12,7 +12,7 @@ bitflags! {
     /// Configuration flags of the Cr0 register.
     pub struct Cr0Flags: u64 {
         /// Enables protected mode.
-        const PROTECTED_MODE_ENABLE = 1 << 0;
+        const PROTECTED_MODE_ENABLE = 1;
         /// Enables monitoring of the coprocessor, typical for x87 instructions.
         ///
         /// Controls together with the `TASK_SWITCHED` flag whether a `wait` or `fwait`
@@ -73,7 +73,7 @@ bitflags! {
     pub struct Cr4Flags: u64 {
         /// Enables hardware-supported performance enhancements for software running in
         /// virtual-8086 mode.
-        const VIRTUAL_8086_MODE_EXTENSIONS = 1 << 0;
+        const VIRTUAL_8086_MODE_EXTENSIONS = 1;
         /// Enables support for protected-mode virtual interrupts.
         const PROTECTED_MODE_VIRTUAL_INTERRUPTS = 1 << 1;
         /// When set, only privilege-level 0 can execute the RDTSC or RDTSCP instructions.

src/registers/model_specific.rs

@@ -48,7 +48,7 @@ pub struct SFMask;
 
 impl Efer {
     /// The underlying model specific register.
-    pub const MSR: Msr = Msr(0xC0000080);
+    pub const MSR: Msr = Msr(0xC000_0080);
 }
 
 impl FsBase {
@@ -85,7 +85,7 @@ bitflags! {
     /// Flags of the Extended Feature Enable Register.
     pub struct EferFlags: u64 {
         /// Enables the `syscall` and `sysret` instructions.
-        const SYSTEM_CALL_EXTENSIONS = 1 << 0;
+        const SYSTEM_CALL_EXTENSIONS = 1;
         /// Activates long mode, requires activating paging.
         const LONG_MODE_ENABLE = 1 << 8;
         /// Indicates that long mode is active.
@@ -264,12 +264,12 @@ mod x86_64 {
             SegmentSelector,
         ) {
             let raw = Self::read_raw();
-            return (
+            (
                 SegmentSelector((raw.0 + 16).try_into().unwrap()),
                 SegmentSelector((raw.0 + 8).try_into().unwrap()),
                 SegmentSelector((raw.1).try_into().unwrap()),
                 SegmentSelector((raw.1 + 8).try_into().unwrap()),
-            );
+            )
         }
 
         /// Write the Ring 0 and Ring 3 segment bases.
@@ -323,7 +323,7 @@ mod x86_64 {
                 return Err("Syscall's segment must be a Ring0 segment.");
             }
 
-            unsafe { Self::write_raw((ss_sysret.0 - 8).into(), cs_syscall.0.into()) };
+            unsafe { Self::write_raw(ss_sysret.0 - 8, cs_syscall.0) };
 
             Ok(())
         }

src/registers/rflags.rs

@@ -58,7 +58,7 @@ bitflags! {
         const PARITY_FLAG = 1 << 2;
         /// Set by hardware if last arithmetic operation generated a carry out of the
         /// most-significant bit of the result.
-        const CARRY_FLAG = 1 << 0;
+        const CARRY_FLAG = 1;
     }
 }
 

src/structures/idt.rs

@@ -824,7 +824,7 @@ bitflags! {
     pub struct PageFaultErrorCode: u64 {
         /// If this flag is set, the page fault was caused by a page-protection violation,
         /// else the page fault was caused by a not-present page.
-        const PROTECTION_VIOLATION = 1 << 0;
+        const PROTECTION_VIOLATION = 1;
 
         /// If this flag is set, the memory access that caused the page fault was a write.
         /// Else the access that caused the page fault is a memory read. This bit does not

src/structures/paging/frame.rs

@@ -74,26 +74,26 @@ impl<S: PageSize> fmt::Debug for PhysFrame<S> {
 impl<S: PageSize> Add<u64> for PhysFrame<S> {
     type Output = Self;
     fn add(self, rhs: u64) -> Self::Output {
-        PhysFrame::containing_address(self.start_address() + rhs * u64::from(S::SIZE))
+        PhysFrame::containing_address(self.start_address() + rhs * S::SIZE)
     }
 }
 
 impl<S: PageSize> AddAssign<u64> for PhysFrame<S> {
     fn add_assign(&mut self, rhs: u64) {
-        *self = self.clone() + rhs;
+        *self = *self + rhs;
     }
 }
 
 impl<S: PageSize> Sub<u64> for PhysFrame<S> {
     type Output = Self;
     fn sub(self, rhs: u64) -> Self::Output {
-        PhysFrame::containing_address(self.start_address() - rhs * u64::from(S::SIZE))
+        PhysFrame::containing_address(self.start_address() - rhs * S::SIZE)
     }
 }
 
 impl<S: PageSize> SubAssign<u64> for PhysFrame<S> {
     fn sub_assign(&mut self, rhs: u64) {
-        *self = self.clone() - rhs;
+        *self = *self - rhs;
     }
 }
 
@@ -118,7 +118,7 @@ impl<S: PageSize> PhysFrameRange<S> {
     /// Returns whether the range contains no frames.
     #[inline]
     pub fn is_empty(&self) -> bool {
-        !(self.start < self.end)
+        self.start >= self.end
     }
 }
 
@@ -127,7 +127,7 @@ impl<S: PageSize> Iterator for PhysFrameRange<S> {
 
     fn next(&mut self) -> Option<Self::Item> {
         if self.start < self.end {
-            let frame = self.start.clone();
+            let frame = self.start;
             self.start += 1;
             Some(frame)
         } else {
@@ -159,7 +159,7 @@ impl<S: PageSize> PhysFrameRangeInclusive<S> {
     /// Returns whether the range contains no frames.
     #[inline]
     pub fn is_empty(&self) -> bool {
-        !(self.start <= self.end)
+        self.start >= self.end
     }
 }
 
@@ -168,7 +168,7 @@ impl<S: PageSize> Iterator for PhysFrameRangeInclusive<S> {
 
     fn next(&mut self) -> Option<Self::Item> {
         if self.start <= self.end {
-            let frame = self.start.clone();
+            let frame = self.start;
             self.start += 1;
             Some(frame)
         } else {

src/structures/paging/page.rs

@@ -206,26 +206,26 @@ impl<S: PageSize> fmt::Debug for Page<S> {
 impl<S: PageSize> Add<u64> for Page<S> {
     type Output = Self;
     fn add(self, rhs: u64) -> Self::Output {
-        Page::containing_address(self.start_address() + rhs * u64::from(S::SIZE))
+        Page::containing_address(self.start_address() + rhs * S::SIZE)
     }
 }
 
 impl<S: PageSize> AddAssign<u64> for Page<S> {
     fn add_assign(&mut self, rhs: u64) {
-        *self = self.clone() + rhs;
+        *self = *self + rhs;
     }
 }
 
 impl<S: PageSize> Sub<u64> for Page<S> {
     type Output = Self;
     fn sub(self, rhs: u64) -> Self::Output {
-        Page::containing_address(self.start_address() - rhs * u64::from(S::SIZE))
+        Page::containing_address(self.start_address() - rhs * S::SIZE)
     }
 }
 
 impl<S: PageSize> SubAssign<u64> for Page<S> {
     fn sub_assign(&mut self, rhs: u64) {
-        *self = self.clone() - rhs;
+        *self = *self - rhs;
     }
 }
 
@@ -249,7 +249,7 @@ pub struct PageRange<S: PageSize = Size4KiB> {
 impl<S: PageSize> PageRange<S> {
     /// Returns wether this range contains no pages.
     pub fn is_empty(&self) -> bool {
-        !(self.start < self.end)
+        self.start >= self.end
     }
 }
 
@@ -258,7 +258,7 @@ impl<S: PageSize> Iterator for PageRange<S> {
 
     fn next(&mut self) -> Option<Self::Item> {
         if self.start < self.end {
-            let page = self.start.clone();
+            let page = self.start;
             self.start += 1;
             Some(page)
         } else {
@@ -300,7 +300,7 @@ pub struct PageRangeInclusive<S: PageSize = Size4KiB> {
 impl<S: PageSize> PageRangeInclusive<S> {
     /// Returns wether this range contains no pages.
     pub fn is_empty(&self) -> bool {
-        !(self.start <= self.end)
+        self.start >= self.end
     }
 }
 
@@ -309,7 +309,7 @@ impl<S: PageSize> Iterator for PageRangeInclusive<S> {
 
     fn next(&mut self) -> Option<Self::Item> {
         if self.start <= self.end {
-            let page = self.start.clone();
+            let page = self.start;
             self.start += 1;
             Some(page)
         } else {

src/structures/paging/page_table.rs

@@ -114,7 +114,7 @@ bitflags! {
     /// Possible flags for a page table entry.
     pub struct PageTableFlags: u64 {
         /// Specifies whether the mapped frame or page table is loaded in memory.
-        const PRESENT =         1 << 0;
+        const PRESENT =         1;
         /// Controls whether writes to the mapped frames are allowed.
         ///
         /// If this bit is unset in a level 1 page table entry, the mapped frame is read-only.