diff --git a/crates/egui-wgpu/src/renderer.rs b/crates/egui-wgpu/src/renderer.rs index 94fb9530..f44b8d46 100644 --- a/crates/egui-wgpu/src/renderer.rs +++ b/crates/egui-wgpu/src/renderer.rs @@ -822,7 +822,7 @@ impl Renderer { ) .expect("Failed to create staging buffer for index data"); let mut index_offset = 0; - for epaint::ClippedPrimitive { primitive, .. } in paint_jobs.iter() { + for epaint::ClippedPrimitive { primitive, .. } in paint_jobs { match primitive { Primitive::Mesh(mesh) => { let size = mesh.indices.len() * std::mem::size_of::(); @@ -857,7 +857,7 @@ impl Renderer { ) .expect("Failed to create staging buffer for vertex data"); let mut vertex_offset = 0; - for epaint::ClippedPrimitive { primitive, .. } in paint_jobs.iter() { + for epaint::ClippedPrimitive { primitive, .. } in paint_jobs { match primitive { Primitive::Mesh(mesh) => { let size = mesh.vertices.len() * std::mem::size_of::(); diff --git a/crates/egui-winit/src/window_settings.rs b/crates/egui-winit/src/window_settings.rs index 5d685765..2b6f7bfa 100644 --- a/crates/egui-winit/src/window_settings.rs +++ b/crates/egui-winit/src/window_settings.rs @@ -116,7 +116,9 @@ impl WindowSettings { return; } - let Some(inner_size_points) = self.inner_size_points else { return; }; + let Some(inner_size_points) = self.inner_size_points else { + return; + }; if let Some(pos_px) = &mut self.inner_position_pixels { clamp_pos_to_monitors(event_loop, inner_size_points, pos_px); diff --git a/crates/egui/src/grid.rs b/crates/egui/src/grid.rs index acd5c357..3f1dc592 100644 --- a/crates/egui/src/grid.rs +++ b/crates/egui/src/grid.rs @@ -220,9 +220,15 @@ impl GridLayout { fn paint_row(&mut self, cursor: &mut Rect, painter: &Painter) { // handle row color painting based on color-picker function - let Some(color_picker) = self.color_picker.as_ref() else { return }; - let Some(row_color) = color_picker(self.row, &self.style) else { return }; - let Some(height) = self.prev_state.row_height(self.row) else {return }; + let Some(color_picker) = self.color_picker.as_ref() else { + return; + }; + let Some(row_color) = color_picker(self.row, &self.style) else { + return; + }; + let Some(height) = self.prev_state.row_height(self.row) else { + return; + }; // Paint background for coming row: let size = Vec2::new(self.prev_state.full_width(self.spacing.x), height); let rect = Rect::from_min_size(cursor.min, size); diff --git a/crates/egui_extras/src/datepicker/mod.rs b/crates/egui_extras/src/datepicker/mod.rs index d1e10f1c..33038d76 100644 --- a/crates/egui_extras/src/datepicker/mod.rs +++ b/crates/egui_extras/src/datepicker/mod.rs @@ -24,7 +24,7 @@ fn month_data(year: i32, month: u32) -> Vec { if start.weekday() == Weekday::Sun { weeks.push(Week { number: start.iso_week().week() as u8, - days: week.drain(..).collect(), + days: std::mem::take(&mut week), }); } start = start.checked_add_signed(Duration::days(1)).unwrap(); diff --git a/crates/epaint/src/textures.rs b/crates/epaint/src/textures.rs index abe8d0b9..b27976f5 100644 --- a/crates/epaint/src/textures.rs +++ b/crates/epaint/src/textures.rs @@ -215,7 +215,7 @@ impl TexturesDelta { } pub fn append(&mut self, mut newer: TexturesDelta) { - self.set.extend(newer.set.into_iter()); + self.set.extend(newer.set); self.free.append(&mut newer.free); }