Skip to content

Commit 75f3a58

Browse files
authored
Fix some warnings (#243)
1 parent 27b3917 commit 75f3a58

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

src/instructions/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
//! Special x86_64 instructions.
44
5-
use crate::VirtAddr;
6-
75
pub mod interrupts;
86
pub mod port;
97
pub mod random;
@@ -58,12 +56,12 @@ pub fn bochs_breakpoint() {
5856
/// instructions to execute.
5957
#[cfg(feature = "inline_asm")]
6058
#[inline(always)]
61-
pub fn read_rip() -> VirtAddr {
59+
pub fn read_rip() -> crate::VirtAddr {
6260
let rip: u64;
6361
unsafe {
6462
asm!(
6563
"lea {}, [rip]", out(reg) rip, options(nostack, nomem)
6664
);
6765
}
68-
VirtAddr::new(rip)
66+
crate::VirtAddr::new(rip)
6967
}

src/structures/gdt.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
//! Types for the Global Descriptor Table and segment selectors.
22
3+
use crate::structures::tss::TaskStateSegment;
34
use crate::PrivilegeLevel;
4-
use crate::{
5-
structures::{tss::TaskStateSegment, DescriptorTablePointer},
6-
VirtAddr,
7-
};
85
use bit_field::BitField;
96
use bitflags::bitflags;
107
use core::fmt;
@@ -221,10 +218,10 @@ impl GlobalDescriptorTable {
221218
/// Creates the descriptor pointer for this table. This pointer can only be
222219
/// safely used if the table is never modified or destroyed while in use.
223220
#[cfg(feature = "instructions")]
224-
fn pointer(&self) -> DescriptorTablePointer {
221+
fn pointer(&self) -> super::DescriptorTablePointer {
225222
use core::mem::size_of;
226-
DescriptorTablePointer {
227-
base: VirtAddr::new(self.table.as_ptr() as u64),
223+
super::DescriptorTablePointer {
224+
base: crate::VirtAddr::new(self.table.as_ptr() as u64),
228225
limit: (self.next_free * size_of::<u64>() - 1) as u16,
229226
}
230227
}

src/structures/idt.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
//! Provides types for the Interrupt Descriptor Table and its entries.
1111
12-
use crate::{structures::DescriptorTablePointer, PrivilegeLevel, VirtAddr};
12+
use crate::{PrivilegeLevel, VirtAddr};
1313
use bit_field::BitField;
1414
use bitflags::bitflags;
1515
use core::fmt;
@@ -438,9 +438,9 @@ impl InterruptDescriptorTable {
438438
/// Creates the descriptor pointer for this table. This pointer can only be
439439
/// safely used if the table is never modified or destroyed while in use.
440440
#[cfg(feature = "instructions")]
441-
fn pointer(&self) -> DescriptorTablePointer {
441+
fn pointer(&self) -> crate::structures::DescriptorTablePointer {
442442
use core::mem::size_of;
443-
DescriptorTablePointer {
443+
crate::structures::DescriptorTablePointer {
444444
base: VirtAddr::new(self as *const _ as u64),
445445
limit: (size_of::<Self>() - 1) as u16,
446446
}

src/structures/paging/page_table.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ impl PageTable {
198198
}
199199
}
200200

201+
/// Creates an empty page table.
201202
#[cfg(not(feature = "const_fn"))]
202203
#[inline]
203204
pub fn new() -> Self {

0 commit comments

Comments
 (0)