From 2ad06203b892a1b6bc3ea9769066d1a959aef690 Mon Sep 17 00:00:00 2001 From: iximeow Date: Fri, 7 May 2021 00:12:19 -0700 Subject: update yaxpeax-arch to 0.0.5, fix interface breakages --- Cargo.toml | 2 +- src/long_mode/display.rs | 14 +++++++------- src/protected_mode/display.rs | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4a8f72b..875e9b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ description = "x86 decoders for the yaxpeax project" readme = "README.md" [dependencies] -yaxpeax-arch = { version = "0.0.4", default-features = false, features = [] } +yaxpeax-arch = { version = "0.0.5", default-features = false, features = [] } "num-traits" = { version = "0.2", default-features = false } "serde" = { version = "1.0", optional = true } "serde_json" = { version = "1.0", optional = true } diff --git a/src/long_mode/display.rs b/src/long_mode/display.rs index 3631800..1d68719 100644 --- a/src/long_mode/display.rs +++ b/src/long_mode/display.rs @@ -143,7 +143,7 @@ impl fmt::Display for Operand { } } -impl > Colorize for Operand { +impl Colorize for Operand { fn colorize(&self, colors: &Y, f: &mut T) -> fmt::Result { match self { &Operand::ImmediateU8(imm) => { @@ -1325,7 +1325,7 @@ impl Opcode { } } -impl > Colorize for Opcode { +impl Colorize for Opcode { fn colorize(&self, colors: &Y, out: &mut T) -> fmt::Result { match self { Opcode::VHADDPS | @@ -2434,7 +2434,7 @@ pub struct InstructionDisplayer<'instr> { * so write to some Write thing i guess. bite me. i really just want to * stop thinking about how to support printing instructions... */ -impl <'instr, T: fmt::Write, Color: fmt::Display, Y: YaxColors> Colorize for InstructionDisplayer<'instr> { +impl <'instr, T: fmt::Write, Y: YaxColors> Colorize for InstructionDisplayer<'instr> { fn colorize(&self, colors: &Y, out: &mut T) -> fmt::Result { // TODO: I DONT LIKE THIS, there is no address i can give contextualize here, // the address operand maybe should be optional.. @@ -2451,7 +2451,7 @@ impl Instruction { } } -fn contextualize_intel>(instr: &Instruction, colors: &Y, _address: u64, _context: Option<&NoContext>, out: &mut T) -> fmt::Result { +fn contextualize_intel(instr: &Instruction, colors: &Y, _address: u64, _context: Option<&NoContext>, out: &mut T) -> fmt::Result { if instr.prefixes.lock() { write!(out, "lock ")?; } @@ -2546,7 +2546,7 @@ fn contextualize_intel>( Ok(()) } -fn contextualize_c>(instr: &Instruction, _colors: &Y, _address: u64, _context: Option<&NoContext>, out: &mut T) -> fmt::Result { +fn contextualize_c(instr: &Instruction, _colors: &Y, _address: u64, _context: Option<&NoContext>, out: &mut T) -> fmt::Result { let mut brace_count = 0; if instr.prefixes.lock() { @@ -2764,7 +2764,7 @@ fn contextualize_c>(inst Ok(()) } -impl <'instr, T: fmt::Write, Color: fmt::Display, Y: YaxColors> ShowContextual for InstructionDisplayer<'instr> { +impl <'instr, T: fmt::Write, Y: YaxColors> ShowContextual for InstructionDisplayer<'instr> { fn contextualize(&self, colors: &Y, address: u64, context: Option<&NoContext>, out: &mut T) -> fmt::Result { let InstructionDisplayer { instr, @@ -2783,7 +2783,7 @@ impl <'instr, T: fmt::Write, Color: fmt::Display, Y: YaxColors> ShowConte } #[cfg(feature="std")] -impl > ShowContextual], Color, T, Y> for Instruction { +impl ShowContextual], T, Y> for Instruction { fn contextualize(&self, colors: &Y, _address: u64, context: Option<&[Option]>, out: &mut T) -> fmt::Result { if self.prefixes.lock() { write!(out, "lock ")?; diff --git a/src/protected_mode/display.rs b/src/protected_mode/display.rs index ffb1acc..e51d2dc 100644 --- a/src/protected_mode/display.rs +++ b/src/protected_mode/display.rs @@ -139,7 +139,7 @@ impl fmt::Display for Operand { } } -impl > Colorize for Operand { +impl Colorize for Operand { fn colorize(&self, colors: &Y, f: &mut T) -> fmt::Result { match self { &Operand::ImmediateU8(imm) => { @@ -1325,7 +1325,7 @@ impl Opcode { } } -impl > Colorize for Opcode { +impl Colorize for Opcode { fn colorize(&self, colors: &Y, out: &mut T) -> fmt::Result { match self { Opcode::VHADDPS | @@ -2445,7 +2445,7 @@ pub struct InstructionDisplayer<'instr> { * so write to some Write thing i guess. bite me. i really just want to * stop thinking about how to support printing instructions... */ -impl <'instr, T: fmt::Write, Color: fmt::Display, Y: YaxColors> Colorize for InstructionDisplayer<'instr> { +impl <'instr, T: fmt::Write, Y: YaxColors> Colorize for InstructionDisplayer<'instr> { fn colorize(&self, colors: &Y, out: &mut T) -> fmt::Result { // TODO: I DONT LIKE THIS, there is no address i can give contextualize here, // the address operand maybe should be optional.. @@ -2462,7 +2462,7 @@ impl Instruction { } } -fn contextualize_intel>(instr: &Instruction, colors: &Y, _address: u32, _context: Option<&NoContext>, out: &mut T) -> fmt::Result { +fn contextualize_intel(instr: &Instruction, colors: &Y, _address: u32, _context: Option<&NoContext>, out: &mut T) -> fmt::Result { if instr.prefixes.lock() { write!(out, "lock ")?; } @@ -2557,7 +2557,7 @@ fn contextualize_intel>( Ok(()) } -fn contextualize_c>(instr: &Instruction, _colors: &Y, _address: u32, _context: Option<&NoContext>, out: &mut T) -> fmt::Result { +fn contextualize_c(instr: &Instruction, _colors: &Y, _address: u32, _context: Option<&NoContext>, out: &mut T) -> fmt::Result { let mut brace_count = 0; if instr.prefixes.lock() { @@ -2775,7 +2775,7 @@ fn contextualize_c>(inst Ok(()) } -impl <'instr, T: fmt::Write, Color: fmt::Display, Y: YaxColors> ShowContextual for InstructionDisplayer<'instr> { +impl <'instr, T: fmt::Write, Y: YaxColors> ShowContextual for InstructionDisplayer<'instr> { fn contextualize(&self, colors: &Y, address: u32, context: Option<&NoContext>, out: &mut T) -> fmt::Result { let InstructionDisplayer { instr, @@ -2794,7 +2794,7 @@ impl <'instr, T: fmt::Write, Color: fmt::Display, Y: YaxColors> ShowConte } #[cfg(feature="std")] -impl > ShowContextual], Color, T, Y> for Instruction { +impl ShowContextual], T, Y> for Instruction { fn contextualize(&self, colors: &Y, _address: u64, context: Option<&[Option]>, out: &mut T) -> fmt::Result { if self.prefixes.lock() { write!(out, "lock ")?; -- cgit v1.1