diff --git a/examples/animation.rs b/examples/animation.rs index 3cf348e..f91b20c 100644 --- a/examples/animation.rs +++ b/examples/animation.rs @@ -67,21 +67,18 @@ fn main() { fn pre_render_frames(width: usize, height: usize) -> Vec>{ let render = |frame_id|{ let elapsed = ((frame_id as f64)/(60.0))*2.0*PI; - let buffer = (0..((width * height) as usize)) + + (0..(width * height)) .map(|index| { - let y = ((index / (width as usize)) as f64)/(height as f64); - let x = ((index % (width as usize)) as f64)/(width as f64); + let y = ((index / width) as f64)/(height as f64); + let x = ((index % width) as f64)/(width as f64); let red = ((((y + elapsed).sin()*0.5+0.5)*255.0).round() as u32).clamp(0, 255); let green = ((((x + elapsed).sin()*0.5+0.5)*255.0).round() as u32).clamp(0, 255); let blue = ((((y - elapsed).cos()*0.5+0.5)*255.0).round() as u32).clamp(0, 255); - let color = blue | (green << 8) | (red << 16); - - color + blue | (green << 8) | (red << 16) }) - .collect::>(); - - buffer + .collect::>() }; #[cfg(target_arch = "wasm32")] diff --git a/examples/winit_wrong_sized_buffer.rs b/examples/winit_wrong_sized_buffer.rs index 528d153..5699f4d 100644 --- a/examples/winit_wrong_sized_buffer.rs +++ b/examples/winit_wrong_sized_buffer.rs @@ -31,10 +31,10 @@ fn main() { match event { Event::RedrawRequested(window_id) if window_id == window.id() => { - let buffer = (0..((BUFFER_WIDTH * BUFFER_HEIGHT) as usize)) + let buffer = (0..(BUFFER_WIDTH * BUFFER_HEIGHT)) .map(|index| { - let y = index / (BUFFER_WIDTH as usize); - let x = index % (BUFFER_WIDTH as usize); + let y = index / BUFFER_WIDTH; + let x = index % BUFFER_WIDTH; let red = x % 255; let green = y % 255; let blue = (x * y) % 255; diff --git a/src/wayland/buffer.rs b/src/wayland/buffer.rs index e38f1ac..e2d4f5d 100644 --- a/src/wayland/buffer.rs +++ b/src/wayland/buffer.rs @@ -33,7 +33,7 @@ impl WaylandBuffer { .expect("Failed to create memfd to store buffer."); let tempfile = unsafe { File::from_raw_fd(tempfile_fd) }; let pool_size = width * height * 4; - let pool = shm.create_pool(tempfile.as_raw_fd(), pool_size, &qh, ()); + let pool = shm.create_pool(tempfile.as_raw_fd(), pool_size, qh, ()); let released = Arc::new(AtomicBool::new(true)); let buffer = pool.create_buffer( 0, @@ -41,7 +41,7 @@ impl WaylandBuffer { height, width * 4, wl_shm::Format::Xrgb8888, - &qh, + qh, released.clone(), ); Self { @@ -129,9 +129,8 @@ impl Dispatch> for State { _: &Connection, _: &QueueHandle, ) { - match event { - wl_buffer::Event::Release => released.store(true, Ordering::SeqCst), - _ => {} + if let wl_buffer::Event::Release = event { + released.store(true, Ordering::SeqCst); } } } diff --git a/src/wayland/mod.rs b/src/wayland/mod.rs index a65688b..84df8d3 100644 --- a/src/wayland/mod.rs +++ b/src/wayland/mod.rs @@ -51,7 +51,7 @@ impl WaylandImpl { "Failed to create proxy for surface ID.", )?; Ok(Self { - event_queue: event_queue, + event_queue, qh, surface, shm, @@ -67,7 +67,7 @@ impl WaylandImpl { buffer } else { // If we have more than 1 unreleased buffer, destroy it - if self.buffers.len() == 0 { + if self.buffers.is_empty() { self.buffers.push_back(buffer); } WaylandBuffer::new(&self.shm, width, height, &self.qh)