From cc94847c7ed09adc9d53424126719a3da5145cd1 Mon Sep 17 00:00:00 2001 From: Eduardo Pinho Date: Thu, 17 Mar 2022 21:24:30 +0000 Subject: [PATCH] Clippy fix --- src/music.rs | 6 +----- src/sound.rs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/music.rs b/src/music.rs index 9922385..6756f69 100644 --- a/src/music.rs +++ b/src/music.rs @@ -89,11 +89,7 @@ impl Music { // no data is never written via the pointer. unsafe { let music = dos_like_sys::createmus(data.as_ptr() as *mut _, data.len() as c_int); - if let Some(music) = NonNull::new(music) { - Some(Music(music)) - } else { - None - } + NonNull::new(music).map(Music) } } diff --git a/src/sound.rs b/src/sound.rs index 8f9ef95..864fe11 100644 --- a/src/sound.rs +++ b/src/sound.rs @@ -173,11 +173,7 @@ pub fn try_create_sound(channels: u32, sample_rate: u32, samples: &[u16]) -> Opt samples.len() as c_int, samples.as_ptr() as *mut c_short, ); - if let Some(sound) = NonNull::new(sound) { - Some(Sound(sound)) - } else { - None - } + NonNull::new(sound).map(Sound) } }