diff --git a/examples/audio-queue-squarewave.rs b/examples/audio-queue-squarewave.rs index df6f88ec..06e4ac58 100644 --- a/examples/audio-queue-squarewave.rs +++ b/examples/audio-queue-squarewave.rs @@ -1,6 +1,6 @@ extern crate sdl2; -use sdl2::audio::{AudioCallback, AudioSpecDesired}; +use sdl2::audio::AudioSpecDesired; use std::time::Duration; diff --git a/examples/audio-wav.rs b/examples/audio-wav.rs index d38d4c1e..b1c9eed9 100644 --- a/examples/audio-wav.rs +++ b/examples/audio-wav.rs @@ -41,13 +41,11 @@ fn main() { let device = audio_subsystem.open_playback(None, &desired_spec, |spec| { let wav = AudioSpecWAV::load_wav(wav_file) - .ok() .expect("Could not load test WAV file"); let cvt = AudioCVT::new( wav.format, wav.channels, wav.freq, spec.format, spec.channels, spec.freq) - .ok() .expect("Could not convert WAV file"); let data = cvt.convert(wav.buffer().to_vec()); diff --git a/examples/game-of-life.rs b/examples/game-of-life.rs index 2098bf32..37324e59 100644 --- a/examples/game-of-life.rs +++ b/examples/game-of-life.rs @@ -35,7 +35,7 @@ mod game_of_life { playground[((PLAYGROUND_WIDTH-2) + i* PLAYGROUND_WIDTH) as usize] = true; } for j in 2..(PLAYGROUND_WIDTH-2) { - playground[(1*PLAYGROUND_WIDTH + j) as usize] = true; + playground[(PLAYGROUND_WIDTH + j) as usize] = true; playground[((PLAYGROUND_HEIGHT-2)*PLAYGROUND_WIDTH + j) as usize] = true; } @@ -54,7 +54,7 @@ mod game_of_life { } } - pub fn get_mut<'a>(&'a mut self, x: i32, y: i32) -> Option<&'a mut bool> { + pub fn get_mut(&mut self, x: i32, y: i32) -> Option<&mut bool> { if x >= 0 && y >= 0 && (x as u32) < PLAYGROUND_WIDTH && (y as u32) < PLAYGROUND_HEIGHT { Some(&mut self.playground[(x as u32 + (y as u32)* PLAYGROUND_WIDTH) as usize]) @@ -86,11 +86,8 @@ mod game_of_life { if !(i == 0 && j == 0) { let peek_x : i32 = (x as i32) + i; let peek_y : i32 = (y as i32) + j; - match self.get(peek_x, peek_y) { - Some(true) => { - count += 1; - }, - _ => {}, + if let Some(true) = self.get(peek_x, peek_y) { + count += 1; } } } @@ -220,22 +217,18 @@ pub fn main() { canvas.clear(); for (i, unit) in (&game).into_iter().enumerate() { let i = i as u32; - match *unit { - true => { - canvas.copy(&square_texture, - None, - Rect::new(((i % PLAYGROUND_WIDTH) * SQUARE_SIZE) as i32, - ((i / PLAYGROUND_WIDTH) * SQUARE_SIZE) as i32, - SQUARE_SIZE, - SQUARE_SIZE)).unwrap(); - }, - false => {}, + if *unit { + canvas.copy(&square_texture, + None, + Rect::new(((i % PLAYGROUND_WIDTH) * SQUARE_SIZE) as i32, + ((i / PLAYGROUND_WIDTH) * SQUARE_SIZE) as i32, + SQUARE_SIZE, + SQUARE_SIZE)).unwrap(); } } canvas.present(); - match game.state() { - game_of_life::State::Playing => { frame += 1; }, - _ => {} + if let game_of_life::State::Playing = game.state() { + frame += 1; }; } } diff --git a/examples/keyboard-state.rs b/examples/keyboard-state.rs index 3f933270..7e55ad8e 100644 --- a/examples/keyboard-state.rs +++ b/examples/keyboard-state.rs @@ -20,10 +20,9 @@ pub fn main() { 'running: loop { for event in events.poll_iter() { - match event { - Event::Quit {..} => break 'running, - _ => () - } + if let Event::Quit {..} = event { + break 'running; + }; } // Create a set of pressed Keys. diff --git a/examples/mixer_demo.rs b/examples/mixer_demo.rs index 09c2fff2..0982b6d5 100644 --- a/examples/mixer_demo.rs +++ b/examples/mixer_demo.rs @@ -32,7 +32,7 @@ fn demo(filename: &Path) { let format = AUDIO_S16LSB; // signed 16 bit samples, in little-endian byte order let channels = 2; // Stereo let chunk_size = 1024; - let _ = sdl2::mixer::open_audio(frequency, format, channels, chunk_size).unwrap(); + sdl2::mixer::open_audio(frequency, format, channels, chunk_size).unwrap(); sdl2::mixer::allocate_channels(0); { diff --git a/examples/mouse-state.rs b/examples/mouse-state.rs index a883f449..6365d5c5 100644 --- a/examples/mouse-state.rs +++ b/examples/mouse-state.rs @@ -1,6 +1,7 @@ extern crate sdl2; use sdl2::event::Event; +use sdl2::keyboard::Keycode; use std::collections::HashSet; use std::time::Duration; @@ -20,8 +21,9 @@ pub fn main() { 'running: loop { for event in events.poll_iter() { match event { - Event::Quit {..} => break 'running, - _ => () + Event::KeyDown { keycode: Some(Keycode::Escape), .. } | + Event::Quit { .. } => break 'running, + _ => {} } } diff --git a/examples/relative-mouse-state.rs b/examples/relative-mouse-state.rs index 13c2f811..94f81c5f 100644 --- a/examples/relative-mouse-state.rs +++ b/examples/relative-mouse-state.rs @@ -2,6 +2,7 @@ extern crate sdl2; use sdl2::event::Event; use sdl2::mouse::MouseButton; +use sdl2::keyboard::Keycode; use std::time::Duration; pub fn main() { @@ -19,8 +20,9 @@ pub fn main() { 'running: loop { for event in events.poll_iter() { match event { - Event::Quit {..} => break 'running, - _ => () + Event::KeyDown { keycode: Some(Keycode::Escape), .. } | + Event::Quit { .. } => break 'running, + _ => {} } } diff --git a/examples/renderer-target.rs b/examples/renderer-target.rs index c766271e..a791483b 100644 --- a/examples/renderer-target.rs +++ b/examples/renderer-target.rs @@ -24,8 +24,8 @@ fn main() { 'mainloop: loop { for event in sdl_context.event_pump().unwrap().poll_iter() { match event { + Event::KeyDown { keycode: Some(Keycode::Escape), .. } | Event::Quit { .. } => break 'mainloop, - Event::KeyDown { keycode: Some(Keycode::Escape), .. } => break 'mainloop, _ => {} } } diff --git a/examples/renderer-texture.rs b/examples/renderer-texture.rs index 7997bc27..15559966 100644 --- a/examples/renderer-texture.rs +++ b/examples/renderer-texture.rs @@ -25,7 +25,7 @@ pub fn main() { for y in 0..256 { for x in 0..256 { let offset = y*pitch + x*3; - buffer[offset + 0] = x as u8; + buffer[offset] = x as u8; buffer[offset + 1] = y as u8; buffer[offset + 2] = 0; } diff --git a/examples/resource_manager.rs b/examples/resource_manager.rs index 420c96ea..84312218 100644 --- a/examples/resource_manager.rs +++ b/examples/resource_manager.rs @@ -43,8 +43,8 @@ fn main() { 'mainloop: loop { for event in sdl_context.event_pump().unwrap().poll_iter() { match event { + Event::KeyDown { keycode: Some(Keycode::Escape), .. } | Event::Quit { .. } => break 'mainloop, - Event::KeyDown { keycode: Some(Keycode::Escape), .. } => break 'mainloop, _ => {} } } diff --git a/examples/ttf_demo.rs b/examples/ttf_demo.rs index 9a2d264b..9f2d0497 100644 --- a/examples/ttf_demo.rs +++ b/examples/ttf_demo.rs @@ -64,7 +64,7 @@ fn run(font_path: &Path) { // render a surface, and convert it to a texture bound to the canvas let surface = font.render("Hello Rust!") .blended(Color::RGBA(255, 0, 0, 255)).unwrap(); - let mut texture = texture_creator.create_texture_from_surface(&surface).unwrap(); + let texture = texture_creator.create_texture_from_surface(&surface).unwrap(); canvas.set_draw_color(Color::RGBA(195, 217, 255, 255)); canvas.clear(); @@ -75,14 +75,14 @@ fn run(font_path: &Path) { let padding = 64; let target = get_centered_rect(width, height, SCREEN_WIDTH - padding, SCREEN_HEIGHT - padding); - canvas.copy(&mut texture, None, Some(target)).unwrap(); + canvas.copy(&texture, None, Some(target)).unwrap(); canvas.present(); 'mainloop: loop { for event in sdl_context.event_pump().unwrap().poll_iter() { match event { - Event::Quit{..} => break 'mainloop, - Event::KeyDown {keycode: Some(Keycode::Escape), ..} => break 'mainloop, + Event::KeyDown {keycode: Some(Keycode::Escape), ..} | + Event::Quit {..} => break 'mainloop, _ => {} } } diff --git a/tests/events.rs b/tests/events.rs index bb550662..828ed2c0 100644 --- a/tests/events.rs +++ b/tests/events.rs @@ -17,7 +17,7 @@ fn test_events() { fn test1(ev: &sdl2::EventSubsystem) { let user_event1_id = unsafe { ev.register_event().unwrap() }; let user_event2_id = unsafe { ev.register_event().unwrap() }; - assert!(user_event1_id != user_event2_id); + assert_ne!(user_event1_id, user_event2_id); } fn test2(ev: &sdl2::EventSubsystem, ep: &mut sdl2::EventPump) { diff --git a/tests/video.rs b/tests/video.rs index 0e252c46..e441a3a3 100644 --- a/tests/video.rs +++ b/tests/video.rs @@ -4,14 +4,10 @@ extern crate sdl2; fn display_name_no_segfault() { let sdl_context = sdl2::init().unwrap(); let video_subsystem = sdl_context.video(); - match video_subsystem { - Ok(video_subsystem) => { - // hopefully no one has a 100 screen to see this test pass - let r = video_subsystem.display_name(99); - assert!(r.is_err()); - }, - Err(_) => { - // environment has no video device (for instance travis) - } - } + if let Ok(video_subsystem) = video_subsystem { + // hopefully no one has a 100 screen to see this test pass + let r = video_subsystem.display_name(99); + assert!(r.is_err()); + } // in Err(), environment has no video device (for instance travis) + // so ignore it }