Skip to content

Commit 4df8de5

Browse files
committed
auto-format everything
1 parent d262b44 commit 4df8de5

File tree

12 files changed

+2336
-582
lines changed

12 files changed

+2336
-582
lines changed

emu-wasm/src/lib.rs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use wasm_bindgen::prelude::*;
22

3-
use gbc::Gameboy as Gameboy_;
43
use gbc::cartridge::Cartridge as Cartridge_;
54
use gbc::joypad::{JoypadEvent, JoypadInput as JoypadInput_};
6-
use gbc::ppu::{GameboyRgb, LCD_WIDTH, LCD_HEIGHT};
5+
use gbc::ppu::{GameboyRgb, LCD_HEIGHT, LCD_WIDTH};
6+
use gbc::Gameboy as Gameboy_;
77

88
// Re-exported JopypadInput enum
99
#[wasm_bindgen]
@@ -42,9 +42,10 @@ impl Cartridge {
4242
#[wasm_bindgen(constructor)]
4343
pub fn new(data: Box<[u8]>) -> Result<Cartridge, JsValue> {
4444
let cartridge = Cartridge_::from_bytes(Vec::from(data), false);
45-
cartridge.validate()
46-
.map(|_| Self(cartridge))
47-
.map_err(|e| JsValue::from_str(&e.to_string()))
45+
cartridge
46+
.validate()
47+
.map(|_| Self(cartridge))
48+
.map_err(|e| JsValue::from_str(&e.to_string()))
4849
}
4950
}
5051

@@ -59,14 +60,11 @@ impl Gameboy {
5960
/// Create a new `Gameboy` from a valid cartridge
6061
#[wasm_bindgen(constructor)]
6162
pub fn new(cartridge: Cartridge) -> Result<Gameboy, JsValue> {
62-
let inner = Gameboy_::init(cartridge.0, false)
63-
.map_err(|e| JsValue::from_str(&e.to_string()))?;
63+
let inner =
64+
Gameboy_::init(cartridge.0, false).map_err(|e| JsValue::from_str(&e.to_string()))?;
6465
let inputs = Vec::new();
6566

66-
Ok(Self {
67-
inner,
68-
inputs,
69-
})
67+
Ok(Self { inner, inputs })
7068
}
7169

7270
/// Run the Gameboy for a single frame.
@@ -111,11 +109,11 @@ impl Gameboy {
111109
/// Create a Gameboy from an existing save state
112110
pub fn load(data: &[u8], cartridge: Cartridge) -> Result<Gameboy, JsValue> {
113111
Gameboy_::load(data, cartridge.0)
114-
.map(|gameboy| Self {
115-
inner: gameboy,
116-
inputs: Vec::new(),
117-
})
118-
.map_err(|e| JsValue::from_str(&e.to_string()))
112+
.map(|gameboy| Self {
113+
inner: gameboy,
114+
inputs: Vec::new(),
115+
})
116+
.map_err(|e| JsValue::from_str(&e.to_string()))
119117
}
120118

121119
pub fn lcd_width() -> usize {

0 commit comments

Comments
 (0)