aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriximeow <me@iximeow.net>2024-06-23 13:15:50 -0700
committeriximeow <me@iximeow.net>2024-06-23 13:15:50 -0700
commitf70232d2bc7703eb062820be8896daf06d94d032 (patch)
treec79b8688a8426ce14972f54423509e0781d44b79
parent949aa2eef7259ae6eac1ec78ae5936d2ee05e8bc (diff)
normalize imports, pull safer_unchecked from yaxpeax-arch
-rw-r--r--src/long_mode/display.rs2
-rw-r--r--src/protected_mode/display.rs3
-rw-r--r--src/real_mode/display.rs5
3 files changed, 5 insertions, 5 deletions
diff --git a/src/long_mode/display.rs b/src/long_mode/display.rs
index 869ac0b..4ffc431 100644
--- a/src/long_mode/display.rs
+++ b/src/long_mode/display.rs
@@ -2,11 +2,11 @@ use core::fmt;
use yaxpeax_arch::{Colorize, ShowContextual, NoColors, YaxColors};
-use crate::safer_unchecked::GetSaferUnchecked as _;
use crate::MEM_SIZE_STRINGS;
use crate::long_mode::{RegSpec, Opcode, Operand, MergeMode, InstDecoder, Instruction, Segment, PrefixRex, OperandSpec};
use yaxpeax_arch::display::DisplaySink;
+use yaxpeax_arch::safer_unchecked::GetSaferUnchecked as _;
trait DisplaySinkExt {
// `write_opcode` depends on all mnemonics being less than 32 bytes long. check that here, at
diff --git a/src/protected_mode/display.rs b/src/protected_mode/display.rs
index 46bb185..2497052 100644
--- a/src/protected_mode/display.rs
+++ b/src/protected_mode/display.rs
@@ -1,13 +1,12 @@
use core::fmt;
-use crate::safer_unchecked::GetSaferUnchecked as _;
use yaxpeax_arch::{Colorize, ShowContextual, NoColors, YaxColors};
-use yaxpeax_arch::display::*;
use crate::MEM_SIZE_STRINGS;
use crate::protected_mode::{RegSpec, Opcode, Operand, MergeMode, InstDecoder, Instruction, Segment, PrefixVex, OperandSpec};
use yaxpeax_arch::display::DisplaySink;
+use yaxpeax_arch::safer_unchecked::GetSaferUnchecked as _;
trait DisplaySinkExt {
// `write_opcode` depends on all mnemonics being less than 32 bytes long. check that here, at
diff --git a/src/real_mode/display.rs b/src/real_mode/display.rs
index b06e3d2..3e3f524 100644
--- a/src/real_mode/display.rs
+++ b/src/real_mode/display.rs
@@ -1,12 +1,13 @@
use core::fmt;
use yaxpeax_arch::{Colorize, ShowContextual, NoColors, YaxColors};
-use yaxpeax_arch::display::*;
-use crate::safer_unchecked::GetSaferUnchecked as _;
use crate::MEM_SIZE_STRINGS;
use crate::real_mode::{RegSpec, Opcode, Operand, MergeMode, InstDecoder, Instruction, Segment, PrefixVex, OperandSpec};
+use yaxpeax_arch::display::DisplaySink;
+use yaxpeax_arch::safer_unchecked::GetSaferUnchecked as _;
+
impl fmt::Display for InstDecoder {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if self == &InstDecoder::default() {