From 404f8ba1e87686e57f3dee605eed4f998d007d33 Mon Sep 17 00:00:00 2001 From: Andrew Keeton Date: Thu, 29 Jan 2015 16:28:53 -0500 Subject: [PATCH] Fix build. --- Cargo.toml | 2 +- src/lib.rs | 7 +++++++ src/machine.rs | 3 +-- src/range_incl.rs | 2 -- src/registers.rs | 1 - 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 67e9802..36c5765 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,5 +39,5 @@ name = "emu6502" name = "emu6502" [dependencies] -log = "0.1.0" +log = "0.2.1" diff --git a/src/lib.rs b/src/lib.rs index 624314a..f8c689b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,10 +25,17 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. +#![feature(core)] +#![feature(hash)] +#![feature(rustc_private)] + // Needed for debug! / log! macros #[macro_use] extern crate log; +#[macro_use] +extern crate rustc_bitflags; + pub mod address; pub mod instruction; pub mod machine; diff --git a/src/machine.rs b/src/machine.rs index d0c95c3..6cd37b7 100644 --- a/src/machine.rs +++ b/src/machine.rs @@ -730,8 +730,7 @@ impl Machine { } } -#[allow(unstable)] -impl std::fmt::Show for Machine { +impl std::fmt::Debug for Machine { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { write!(f, "Machine Dump:\n\nAccumulator: {}", self.registers.accumulator) diff --git a/src/range_incl.rs b/src/range_incl.rs index ea52263..522bc6e 100644 --- a/src/range_incl.rs +++ b/src/range_incl.rs @@ -1,5 +1,3 @@ -#![allow(unstable)] - use std::num::Int; pub struct RangeIncl { diff --git a/src/registers.rs b/src/registers.rs index be53267..050d1c8 100644 --- a/src/registers.rs +++ b/src/registers.rs @@ -55,7 +55,6 @@ impl StatusArgs { } pub bitflags! { -#[allow(unstable)] #[derive(Show)] flags Status: u8 { const PS_NEGATIVE = 0b10000000,