Adopted to purely namespaced enums (rust-lang/rust#18973)

reima · Nov 18, 2014 · 68323cf · 68323cf
1 parent 1ea8efb
commit 68323cf
Show file tree

Hide file tree

Showing 9 changed files with 260 additions and 259 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/cartridge.rs b/src/cartridge.rs
@@ -37,7 +37,7 @@ impl Cartridge {
     let mbc =
       match cartridge_type {
         0x00 => None,
-        0x01 => Some(MBC1),
+        0x01 => Some(MBC::MBC1),
         _ => panic!("unsupported cartridge type: 0x{:02X}", cartridge_type)
       };
 
@@ -92,7 +92,7 @@ impl Mem for Cartridge {
   fn storeb(&mut self, addr: u16, val: u8) {
     match self.mbc {
       None => info!("store 0x{:02X} in cartridge ROM at ${:04X}", val, addr),
-      Some(MBC1) => {
+      Some(MBC::MBC1) => {
         match addr {
           0x0000...0x1fff => debug!("RAM enable"),
           0x2000...0x3fff => { // set lower 5 bits of ROM bank