skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some clippy fixes from 1.72.0

This commit is contained in:
Emil Ernerfeldt 2023-08-25 07:44:25 +02:00
parent 627e1b3d50
commit b6f46b000b
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/egui-wgpu/src/renderer.rs
View File

@ -822,7 +822,7 @@ impl Renderer {
) )
.expect("Failed to create staging buffer for index data"); .expect("Failed to create staging buffer for index data");
let mut index_offset = 0; let mut index_offset = 0;
for epaint::ClippedPrimitive { primitive, .. } in paint_jobs.iter() { for epaint::ClippedPrimitive { primitive, .. } in paint_jobs {
match primitive { match primitive {
Primitive::Mesh(mesh) => { Primitive::Mesh(mesh) => {
let size = mesh.indices.len() * std::mem::size_of::<u32>(); let size = mesh.indices.len() * std::mem::size_of::<u32>();
@ -857,7 +857,7 @@ impl Renderer {
) )
.expect("Failed to create staging buffer for vertex data"); .expect("Failed to create staging buffer for vertex data");
let mut vertex_offset = 0; let mut vertex_offset = 0;
for epaint::ClippedPrimitive { primitive, .. } in paint_jobs.iter() { for epaint::ClippedPrimitive { primitive, .. } in paint_jobs {
match primitive { match primitive {
Primitive::Mesh(mesh) => { Primitive::Mesh(mesh) => {
let size = mesh.vertices.len() * std::mem::size_of::<Vertex>(); let size = mesh.vertices.len() * std::mem::size_of::<Vertex>();

4
crates/egui-winit/src/window_settings.rs
View File

@ -116,7 +116,9 @@ impl WindowSettings {
return; 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 { if let Some(pos_px) = &mut self.inner_position_pixels {
clamp_pos_to_monitors(event_loop, inner_size_points, pos_px); clamp_pos_to_monitors(event_loop, inner_size_points, pos_px);

12
crates/egui/src/grid.rs
View File

@ -220,9 +220,15 @@ impl GridLayout {
fn paint_row(&mut self, cursor: &mut Rect, painter: &Painter) { fn paint_row(&mut self, cursor: &mut Rect, painter: &Painter) {
// handle row color painting based on color-picker function // handle row color painting based on color-picker function
let Some(color_picker) = self.color_picker.as_ref() else { return }; let Some(color_picker) = self.color_picker.as_ref() else {
let Some(row_color) = color_picker(self.row, &self.style) else { return }; return;
let Some(height) = self.prev_state.row_height(self.row) 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: // Paint background for coming row:
let size = Vec2::new(self.prev_state.full_width(self.spacing.x), height); let size = Vec2::new(self.prev_state.full_width(self.spacing.x), height);
let rect = Rect::from_min_size(cursor.min, size); let rect = Rect::from_min_size(cursor.min, size);

2
crates/egui_extras/src/datepicker/mod.rs
View File

@ -24,7 +24,7 @@ fn month_data(year: i32, month: u32) -> Vec<Week> {
if start.weekday() == Weekday::Sun { if start.weekday() == Weekday::Sun {
weeks.push(Week { weeks.push(Week {
number: start.iso_week().week() as u8, 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(); start = start.checked_add_signed(Duration::days(1)).unwrap();

2
crates/epaint/src/textures.rs
View File

@ -215,7 +215,7 @@ impl TexturesDelta {
} }
pub fn append(&mut self, mut newer: 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); self.free.append(&mut newer.free);
} }