cargo fmt

ctru-rs/src/services/ndsp/mod.rs

@@ -210,9 +210,7 @@ impl Channel<'_> {
     /// To ensure safety, checks within [WaveInfo] will clear the whole channel queue if any queued [WaveInfo] is dropped prematurely.
     pub fn queue_wave(&self, wave: &mut WaveInfo) -> std::result::Result<(), NdspError> {
         match wave.get_status() {
-            WaveStatus::Playing | WaveStatus::Queued => {
+            WaveStatus::Playing | WaveStatus::Queued => return Err(NdspError::WaveBusy(self.id)),
-                return Err(NdspError::WaveBusy(self.id))
-            }
             _ => (),
         }
 

ctru-rs/src/services/ndsp/wave.rs

@@ -97,9 +97,7 @@ impl WaveInfo {
     pub fn set_sample_count(&mut self, sample_count: u32) -> Result<(), NdspError> {
         match self.get_status() {
             WaveStatus::Playing | WaveStatus::Queued => {
-                return Err(NdspError::WaveBusy(
+                return Err(NdspError::WaveBusy(self.played_on_channel.unwrap()));
-                    self.played_on_channel.unwrap(),
-                ));
             }
             _ => (),
         }