Skip to content

Commit 68323cf

Browse files
committed
Adopted to purely namespaced enums (rust-lang/rust#18973)
1 parent 1ea8efb commit 68323cf

File tree

9 files changed

+260
-259
lines changed

9 files changed

+260
-259
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cartridge.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl Cartridge {
3737
let mbc =
3838
match cartridge_type {
3939
0x00 => None,
40-
0x01 => Some(MBC1),
40+
0x01 => Some(MBC::MBC1),
4141
_ => panic!("unsupported cartridge type: 0x{:02X}", cartridge_type)
4242
};
4343

@@ -92,7 +92,7 @@ impl Mem for Cartridge {
9292
fn storeb(&mut self, addr: u16, val: u8) {
9393
match self.mbc {
9494
None => info!("store 0x{:02X} in cartridge ROM at ${:04X}", val, addr),
95-
Some(MBC1) => {
95+
Some(MBC::MBC1) => {
9696
match addr {
9797
0x0000...0x1fff => debug!("RAM enable"),
9898
0x2000...0x3fff => { // set lower 5 bits of ROM bank

0 commit comments

Comments
 (0)