migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00
Code Activity

Clippy fixes

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-13 15:33:10 +01:00
parent 4bee4f8cf6
commit 8d35f51b52
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/eframe/src/native/run.rs
View File

@@ -261,7 +261,7 @@ fn run_and_return(
} }
} }
let mut next_repaint_time = windows_next_repaint_times.values().min().cloned(); let mut next_repaint_time = windows_next_repaint_times.values().min().copied();
// This is for not duplicating redraw requests // This is for not duplicating redraw requests
use winit::event::Event; use winit::event::Event;
@@ -270,7 +270,7 @@ fn run_and_return(
Event::RedrawEventsCleared | Event::RedrawRequested(_) | Event::Resumed Event::RedrawEventsCleared | Event::RedrawRequested(_) | Event::Resumed
) { ) {
windows_next_repaint_times.retain(|window_id, repaint_time| { windows_next_repaint_times.retain(|window_id, repaint_time| {
if *repaint_time > Instant::now() { if Instant::now() < *repaint_time {
return true; return true;
}; };
@@ -285,7 +285,7 @@ fn run_and_return(
} else { } else {
false false
} }
}) });
} }
if let Some(next_repaint_time) = next_repaint_time { if let Some(next_repaint_time) = next_repaint_time {
@@ -396,7 +396,7 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp +
} }
} }
let mut next_repaint_time = windows_next_repaint_times.values().min().cloned(); let mut next_repaint_time = windows_next_repaint_times.values().min().copied();
// This is for not duplicating redraw requests // This is for not duplicating redraw requests
use winit::event::Event; use winit::event::Event;
@@ -405,7 +405,7 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp +
Event::RedrawEventsCleared | Event::RedrawRequested(_) | Event::Resumed Event::RedrawEventsCleared | Event::RedrawRequested(_) | Event::Resumed
) { ) {
windows_next_repaint_times.retain(|window_id, repaint_time| { windows_next_repaint_times.retain(|window_id, repaint_time| {
if *repaint_time > Instant::now() { if Instant::now() < *repaint_time {
return true; return true;
} }
@@ -420,7 +420,7 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp +
} else { } else {
false false
} }
}) });
} }
if let Some(next_repaint_time) = next_repaint_time { if let Some(next_repaint_time) = next_repaint_time {

7
crates/egui/src/context.rs
View File

@@ -226,7 +226,12 @@ impl ContextImpl {
self.memory.begin_frame( self.memory.begin_frame(
self.input.get(&viewport_id).unwrap_or(&Default::default()), self.input.get(&viewport_id).unwrap_or(&Default::default()),
&new_raw_input, &new_raw_input,
&ViewportIdSet::from_iter(self.viewports.keys().cloned().chain([ViewportId::ROOT])), &self
.viewports
.keys()
.copied()
.chain([ViewportId::ROOT])
.collect(),
); );
let input = self let input = self