summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriximeow <me@iximeow.net>2021-05-07 00:23:01 -0700
committeriximeow <me@iximeow.net>2021-05-07 00:23:39 -0700
commit0eed3ca0c9413071a15bd5171a3522a413aae383 (patch)
tree8442644252bd03848f8b6159a383195980ad91a1
parent15fd1cc36a78f0b770668dc10700987254a5e500 (diff)
remove unneeded termion dep0.0.6
color information comes from yaxpeax-arch these days -- update yaxpeax-arch to 0.0.5 to swap its termion dep for crossterm while we're at it
-rw-r--r--Cargo.toml5
-rw-r--r--src/display.rs6
-rw-r--r--src/lib.rs1
3 files changed, 5 insertions, 7 deletions
diff --git a/Cargo.toml b/Cargo.toml
index daf3a9f..89c8a4a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,14 @@
[package]
name = "yaxpeax-msp430"
-version = "0.0.5"
+version = "0.0.6"
authors = [ "iximeow <me@iximeow.net>" ]
license = "0BSD"
repository = "http://git.iximeow.net/yaxpeax-msp430/"
description = "msp430 decoders for the yaxpeax project"
[dependencies]
-yaxpeax-arch = { version = "0.0.4", default-features = false, features = [] }
-"termion" = "1.4.0"
+yaxpeax-arch = { version = "0.0.5", default-features = false, features = [] }
"serde" = { version = "1.0", optional = true }
"serde_derive" = { version = "1.0", optional = true }
diff --git a/src/display.rs b/src/display.rs
index d9b8f10..54147f7 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -25,7 +25,7 @@ impl fmt::Display for DecodeError {
/// No per-operand when contextualizing an instruction.
pub struct NoContext;
-impl <T: std::fmt::Write, Color: fmt::Display, Y: YaxColors<Color>> ShowContextual<<MSP430 as Arch>::Address, NoContext, Color, T, Y> for Instruction {
+impl <T: std::fmt::Write, Y: YaxColors> ShowContextual<<MSP430 as Arch>::Address, NoContext, T, Y> for Instruction {
fn contextualize(&self, _colors: &Y, _address: <MSP430 as Arch>::Address, _context: Option<&NoContext>, out: &mut T) -> std::fmt::Result {
write!(out, "{}", self.opcode)?;
match self.op_width {
@@ -49,7 +49,7 @@ impl <T: std::fmt::Write, Color: fmt::Display, Y: YaxColors<Color>> ShowContextu
}
#[cfg(feature="std")]
-impl <T: std::fmt::Write, Color: fmt::Display, Y: YaxColors<Color>> ShowContextual<<MSP430 as Arch>::Address, [Option<String>], Color, T, Y> for Instruction {
+impl <T: std::fmt::Write, Y: YaxColors> ShowContextual<<MSP430 as Arch>::Address, [Option<String>], T, Y> for Instruction {
fn contextualize(&self, _colors: &Y, _address: <MSP430 as Arch>::Address, _context: Option<&[Option<String>]>, out: &mut T) -> std::fmt::Result {
write!(out, "{}", self.opcode)?;
match self.op_width {
@@ -116,7 +116,7 @@ impl Display for Operand {
}
}
-impl <T: std::fmt::Write, Color: fmt::Display, Y: YaxColors<Color>> Colorize<T, Color, Y> for Operand {
+impl <T: std::fmt::Write, Y: YaxColors> Colorize<T, Y> for Operand {
fn colorize(&self, _colors: &Y, out: &mut T) -> std::fmt::Result {
fn signed_hex(num: i16) -> String {
if num >= 0 {
diff --git a/src/lib.rs b/src/lib.rs
index 7977c88..8d3a257 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,7 +6,6 @@ extern crate serde;
//use serde::{Serialize, Deserialize};
extern crate yaxpeax_arch;
-extern crate termion;
use yaxpeax_arch::{Arch, AddressDiff, Decoder, LengthedInstruction};