Fix compilation with latest rustc

AUTHORS.txt

@@ -3,3 +3,4 @@
 Alex Weisberger <[email protected]>
 Andrew Keeton <[email protected]>
 Johannes Muenzel <[email protected]>
+Matthias Endler <[email protected]>

Cargo.toml

@@ -39,5 +39,6 @@ name = "emu6502"
 name = "emu6502"
 
 [dependencies]
-log = "0.2.3"
-
+bitflags = "0.9.1"
+log = "0.3.8"
+num = "0.1"

src/address.rs

@@ -25,16 +25,15 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-use std::num::Int;
 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, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub struct AddressDiff(pub i32);
 
-#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub struct Address(pub u16);
 
 impl Add<AddressDiff> for Address {
@@ -57,7 +56,7 @@ impl Add for AddressDiff {
     }
 }
 
-#[derive(Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct CheckedAddressDiff(u16);
 
 impl Add<CheckedAddressDiff> for Address {
@@ -77,7 +76,7 @@ impl Add<CheckedAddressDiff> for Address {
 impl Address {
     pub fn to_u16(&self) -> u16 {
         match *self {
-            Address(address_) => address_
+            Address(address_) => address_,
         }
     }
 
@@ -93,4 +92,3 @@ impl Address {
         (self.to_u16() & 0x00ff) as u8
     }
 }
-

src/lib.rs

@@ -25,20 +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;
 
+extern crate num;
+
 #[macro_use]
-extern crate rustc_bitflags;
+extern crate bitflags;
 
 pub mod address;
 pub mod instruction;
 pub mod machine;
 pub mod memory;
-pub mod range_incl;
 pub mod registers;