diff options
| -rw-r--r-- | Cargo.lock | 18 | ||||
| -rw-r--r-- | src/lib.rs | 53 |
2 files changed, 36 insertions, 35 deletions
@@ -2,7 +2,7 @@ # It is not intended for manual editing. [[package]] name = "libc" -version = "0.2.54" +version = "0.2.58" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -30,15 +30,15 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.91" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "termion" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -49,15 +49,15 @@ name = "yaxpeax-arch" version = "0.0.1" dependencies = [ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)", + "termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] -"checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6" +"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" "checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" "checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -"checksum serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "a72e9b96fa45ce22a4bc23da3858dfccfd60acd28a25bcd328a98fdd6bea43fd" -"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" +"checksum serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)" = "960e29cf7004b3b6e65fc5002981400eb3ccc017a08a2406940823e58e7179a9" +"checksum termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a8fb22f7cde82c8220e5aeacb3258ed7ce996142c77cba193f203515e26c330" @@ -42,7 +42,7 @@ pub trait AddrParse: Sized { pub trait Address where Self: Serialize + for<'de> Deserialize<'de> + Debug + Display + AddressDisplay + - Copy + Clone + Sized + + Copy + Clone + Sized + Hash + Ord + Eq + PartialEq + Bounded + Add<Output=Self> + Sub<Output=Self> + AddAssign + SubAssign + @@ -57,7 +57,7 @@ pub trait Address where Self: #[cfg(not(feature="use-serde"))] pub trait Address where Self: Debug + Display + AddressDisplay + - Copy + Clone + Sized + + Copy + Clone + Sized + Hash + Ord + Eq + PartialEq + Bounded + Add<Output=Self> + Sub<Output=Self> + AddAssign + SubAssign + @@ -188,34 +188,35 @@ pub trait LengthedInstruction { impl Serialize for ColorSettings { fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> { use serde::ser::SerializeStruct; - let mut s = serializer.serialize_struct("ColorSettings", 0)?; + let s = serializer.serialize_struct("ColorSettings", 0)?; s.end() } } +#[allow(dead_code)] pub struct ColorSettings { - arithmetic: color::Fg<&'static color::Color>, - stack: color::Fg<&'static color::Color>, - nop: color::Fg<&'static color::Color>, - stop: color::Fg<&'static color::Color>, - control: color::Fg<&'static color::Color>, - data: color::Fg<&'static color::Color>, - comparison: color::Fg<&'static color::Color>, - invalid: color::Fg<&'static color::Color>, - platform: color::Fg<&'static color::Color>, - misc: color::Fg<&'static color::Color>, - - register: color::Fg<&'static color::Color>, - program_counter: color::Fg<&'static color::Color>, - - number: color::Fg<&'static color::Color>, - zero: color::Fg<&'static color::Color>, - one: color::Fg<&'static color::Color>, - minus_one: color::Fg<&'static color::Color>, - - function: color::Fg<&'static color::Color>, - symbol: color::Fg<&'static color::Color>, - address: color::Fg<&'static color::Color> + arithmetic: color::Fg<&'static dyn color::Color>, + stack: color::Fg<&'static dyn color::Color>, + nop: color::Fg<&'static dyn color::Color>, + stop: color::Fg<&'static dyn color::Color>, + control: color::Fg<&'static dyn color::Color>, + data: color::Fg<&'static dyn color::Color>, + comparison: color::Fg<&'static dyn color::Color>, + invalid: color::Fg<&'static dyn color::Color>, + platform: color::Fg<&'static dyn color::Color>, + misc: color::Fg<&'static dyn color::Color>, + + register: color::Fg<&'static dyn color::Color>, + program_counter: color::Fg<&'static dyn color::Color>, + + number: color::Fg<&'static dyn color::Color>, + zero: color::Fg<&'static dyn color::Color>, + one: color::Fg<&'static dyn color::Color>, + minus_one: color::Fg<&'static dyn color::Color>, + + function: color::Fg<&'static dyn color::Color>, + symbol: color::Fg<&'static dyn color::Color>, + address: color::Fg<&'static dyn color::Color> } impl Default for ColorSettings { @@ -452,7 +453,7 @@ impl <'a> YaxColors for Option<&'a ColorSettings> { } pub enum Colored<T: Display> { - Color(T, color::Fg<&'static color::Color>), + Color(T, color::Fg<&'static dyn color::Color>), Just(T) } |