Misc fixes

- Fix input map serialization on desktop
- Fix save file size handling on web

Author: kelpsyberry

core/src/cpu/arm9/dma.rs

@@ -35,7 +35,7 @@ impl<E: Engine> Arm9<E> {
         if !value.enabled() {
             // Stop DMA; the code can avoid computing everything else as the control register will
             // be written to again.
-            
+
             channel.timing = Timing::Disabled;
             if prev_value.enabled() {
                 // Handle self-disabling DMAs

frontend/desktop/src/input/map.rs

@@ -220,31 +220,16 @@ impl<'de> Deserialize<'de> for Map {
             {
                 let mut keypad = None;
                 let mut hotkeys = None;
-                loop {
-                    if let Ok(next) = map.next_entry::<&str, DeserializedKeypadMap>() {
-                        if let Some(("keypad", value)) = next {
-                            keypad = Some(value);
-                        } else {
-                            break;
-                        }
-                    }
-                    if let Ok(next) = map.next_entry::<&str, DeserializedHotkeyMap>() {
-                        if let Some(("hotkeys", value)) = next {
-                            hotkeys = Some(value);
-                        } else {
-                            break;
-                        }
+                while let Some(key) = map.next_key()? {
+                    match key {
+                        "keypad" => keypad = Some(map.next_value::<DeserializedKeypadMap>()?.0),
+                        "hotkeys" => hotkeys = Some(map.next_value::<DeserializedHotkeyMap>()?.0),
+                        _ => {}
                     }
                 }
                 Ok(Map {
-                    keypad: match keypad {
-                        Some(keypad) => keypad.0,
-                        None => default_keypad_map(),
-                    },
-                    hotkeys: match hotkeys {
-                        Some(hotkeys) => hotkeys.0,
-                        None => default_hotkey_map(),
-                    },
+                    keypad: keypad.unwrap_or_else(default_keypad_map),
+                    hotkeys: hotkeys.unwrap_or_else(default_hotkey_map),
                 })
             }
         }

frontend/web/crate/src/lib.rs

@@ -303,10 +303,10 @@ pub fn create_emu_state(
             let expected_len = save_type.expected_len().unwrap();
             let save_contents = match save_contents {
                 Some(save_contents) => {
-                    SaveContents::Existing(if save_contents.len() == expected_len {
+                    SaveContents::Existing(if save_contents.len() != expected_len {
                         let mut new_contents = BoxedByteSlice::new_zeroed(expected_len);
-                        new_contents[..save_contents.len()].copy_from_slice(&save_contents);
-                        drop(save_contents);
+                        let copy_len = save_contents.len().min(expected_len);
+                        new_contents[..copy_len].copy_from_slice(&save_contents[..copy_len]);
                         new_contents
                     } else {
                         save_contents
@@ -322,6 +322,7 @@ pub fn create_emu_state(
                     #[cfg(feature = "log")]
                     logger.new(slog::o!("ds_spi" => "eeprom_4k")),
                 )
+                // NOTE: The save contents' size is ensured beforehand, this should never occur.
                 .expect("couldn't create 4 Kib EEPROM DS slot SPI device")
                 .into(),
                 SaveType::EepromFram64k | SaveType::EepromFram512k | SaveType::EepromFram1m => {
@@ -331,6 +332,7 @@ pub fn create_emu_state(
                         #[cfg(feature = "log")]
                         logger.new(slog::o!("ds_spi" => "eeprom_fram")),
                     )
+                    // NOTE: The save contents' size is ensured beforehand, this should never occur.
                     .expect("couldn't create EEPROM/FRAM DS slot SPI device")
                     .into()
                 }
@@ -342,6 +344,7 @@ pub fn create_emu_state(
                         #[cfg(feature = "log")]
                         logger.new(slog::o!("ds_spi" => if has_ir { "flash" } else { "flash_ir" })),
                     )
+                    // NOTE: The save contents' size is ensured beforehand, this should never occur.
                     .expect("couldn't create FLASH DS slot SPI device")
                     .into()
                 }