From 82e2cac30c1e99b03bdd8a0bc0e40cfa1241e636 Mon Sep 17 00:00:00 2001
From: Andrew Keeton <andrewrkeeton@gmail.com>
Date: Thu, 12 Feb 2015 17:13:13 -0500
Subject: [PATCH] Fix build.

---
 Cargo.toml         | 2 +-
 src/address.rs     | 4 ++--
 src/instruction.rs | 2 +-
 src/registers.rs   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 36c5765..c887853 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,5 +39,5 @@ name = "emu6502"
 name = "emu6502"
 
 [dependencies]
-log = "0.2.1"
+log = "0.2.3"
 
diff --git a/src/address.rs b/src/address.rs
index 3b8bcd3..2e4f0ac 100644
--- a/src/address.rs
+++ b/src/address.rs
@@ -31,10 +31,10 @@ use std::ops::Add;
 // The idea here is that it doesn't make sense to add two addresses, but it
 // does make sense to add an address and an "address-difference". (If this
 // is too annoying to work with we should let it go.)
-#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Show)]
+#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub struct AddressDiff(pub i32);
 
-#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Show)]
+#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub struct Address(pub u16);
 
 impl Add<AddressDiff> for Address {
diff --git a/src/instruction.rs b/src/instruction.rs
index ecca302..8220aba 100644
--- a/src/instruction.rs
+++ b/src/instruction.rs
@@ -46,7 +46,7 @@ use machine::Machine;
 //       PC | program counter
 //
 
-#[derive(Copy, Show, PartialEq, Eq)]
+#[derive(Copy, Debug, PartialEq, Eq)]
 pub enum Instruction
       //                                  i/o vars should be listed as follows:
       //                                  NV BDIZC A X Y S PC M
diff --git a/src/registers.rs b/src/registers.rs
index 050d1c8..5c1af8d 100644
--- a/src/registers.rs
+++ b/src/registers.rs
@@ -55,7 +55,7 @@ impl StatusArgs {
 }
 
 pub bitflags! {
-#[derive(Show)]
+#[derive(Debug)]
     flags Status: u8 {
         const PS_NEGATIVE           = 0b10000000,
         const PS_OVERFLOW           = 0b01000000,
@@ -121,7 +121,7 @@ impl Status {
     }
 }
 
-#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Show)]
+#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub struct StackPointer(pub u8);
 
 impl StackPointer {
@@ -144,7 +144,7 @@ impl StackPointer {
     }
 }
 
-#[derive(Copy, PartialEq, Eq, Show)]
+#[derive(Copy, PartialEq, Eq, Debug)]
 pub struct Registers {
     pub accumulator:     i8,
     pub index_x:         i8,