From f01b2b76c888f6e40eebabbacf736a6ac0b15ae9 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 16 Nov 2023 15:50:44 +0100 Subject: [PATCH] Fix clippy issues from 1.74 (#3558) Nothing major --- crates/egui/src/context.rs | 6 +++--- crates/egui/src/util/id_type_map.rs | 2 +- crates/egui/src/widgets/text_edit/builder.rs | 9 +++------ crates/egui_extras/src/loaders/ehttp_loader.rs | 2 +- crates/egui_extras/src/loaders/file_loader.rs | 2 +- crates/egui_extras/src/loaders/image_loader.rs | 2 +- crates/egui_extras/src/loaders/svg_loader.rs | 2 +- crates/epaint/src/util/ordered_float.rs | 9 +++------ 8 files changed, 14 insertions(+), 20 deletions(-) diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs index 9dc28a54..d12056a1 100644 --- a/crates/egui/src/context.rs +++ b/crates/egui/src/context.rs @@ -73,7 +73,7 @@ impl ContextImpl { } fn request_repaint_after(&mut self, delay: Duration, viewport_id: ViewportId) { - let mut viewport = self.viewports.entry(viewport_id).or_default(); + let viewport = self.viewports.entry(viewport_id).or_default(); // Each request results in two repaints, just to give some things time to settle. // This solves some corner-cases of missing repaints on frame-delayed responses. @@ -2607,7 +2607,7 @@ impl Context { ctx.viewport_parents .insert(new_viewport_id, ctx.viewport_id()); - let mut viewport = ctx.viewports.entry(new_viewport_id).or_default(); + let viewport = ctx.viewports.entry(new_viewport_id).or_default(); viewport.class = ViewportClass::Deferred; viewport.builder = viewport_builder; viewport.used = true; @@ -2666,7 +2666,7 @@ impl Context { ctx.viewport_parents .insert(new_viewport_id, parent_viewport_id); - let mut viewport = ctx.viewports.entry(new_viewport_id).or_default(); + let viewport = ctx.viewports.entry(new_viewport_id).or_default(); viewport.builder = builder.clone(); viewport.used = true; viewport.viewport_ui_cb = None; // it is immediate diff --git a/crates/egui/src/util/id_type_map.rs b/crates/egui/src/util/id_type_map.rs index 8cb33360..9e33849a 100644 --- a/crates/egui/src/util/id_type_map.rs +++ b/crates/egui/src/util/id_type_map.rs @@ -119,7 +119,7 @@ impl std::fmt::Debug for Element { match &self { Self::Value { value, .. } => f .debug_struct("Element::Value") - .field("type_id", &value.type_id()) + .field("type_id", &(**value).type_id()) .finish_non_exhaustive(), Self::Serialized(SerializedElement { type_id, diff --git a/crates/egui/src/widgets/text_edit/builder.rs b/crates/egui/src/widgets/text_edit/builder.rs index b7282eff..d96a8a21 100644 --- a/crates/egui/src/widgets/text_edit/builder.rs +++ b/crates/egui/src/widgets/text_edit/builder.rs @@ -802,12 +802,9 @@ impl<'t> TextEdit<'t> { let glyph_count = row.glyphs.len(); let mut value = String::new(); value.reserve(glyph_count); - let mut character_lengths = Vec::::new(); - character_lengths.reserve(glyph_count); - let mut character_positions = Vec::::new(); - character_positions.reserve(glyph_count); - let mut character_widths = Vec::::new(); - character_widths.reserve(glyph_count); + let mut character_lengths = Vec::::with_capacity(glyph_count); + let mut character_positions = Vec::::with_capacity(glyph_count); + let mut character_widths = Vec::::with_capacity(glyph_count); let mut word_lengths = Vec::::new(); let mut was_at_word_end = false; let mut last_word_start = 0usize; diff --git a/crates/egui_extras/src/loaders/ehttp_loader.rs b/crates/egui_extras/src/loaders/ehttp_loader.rs index 8cc9a6e7..ad7ce49d 100644 --- a/crates/egui_extras/src/loaders/ehttp_loader.rs +++ b/crates/egui_extras/src/loaders/ehttp_loader.rs @@ -45,7 +45,7 @@ pub struct EhttpLoader { } impl EhttpLoader { - pub const ID: &str = egui::generate_loader_id!(EhttpLoader); + pub const ID: &'static str = egui::generate_loader_id!(EhttpLoader); } const PROTOCOLS: &[&str] = &["http://", "https://"]; diff --git a/crates/egui_extras/src/loaders/file_loader.rs b/crates/egui_extras/src/loaders/file_loader.rs index 31e6cf2e..10bfec53 100644 --- a/crates/egui_extras/src/loaders/file_loader.rs +++ b/crates/egui_extras/src/loaders/file_loader.rs @@ -20,7 +20,7 @@ pub struct FileLoader { } impl FileLoader { - pub const ID: &str = egui::generate_loader_id!(FileLoader); + pub const ID: &'static str = egui::generate_loader_id!(FileLoader); } const PROTOCOL: &str = "file://"; diff --git a/crates/egui_extras/src/loaders/image_loader.rs b/crates/egui_extras/src/loaders/image_loader.rs index c566e654..02e0cdd4 100644 --- a/crates/egui_extras/src/loaders/image_loader.rs +++ b/crates/egui_extras/src/loaders/image_loader.rs @@ -14,7 +14,7 @@ pub struct ImageCrateLoader { } impl ImageCrateLoader { - pub const ID: &str = egui::generate_loader_id!(ImageCrateLoader); + pub const ID: &'static str = egui::generate_loader_id!(ImageCrateLoader); } fn is_supported_uri(uri: &str) -> bool { diff --git a/crates/egui_extras/src/loaders/svg_loader.rs b/crates/egui_extras/src/loaders/svg_loader.rs index c5ac37b4..ff2cab86 100644 --- a/crates/egui_extras/src/loaders/svg_loader.rs +++ b/crates/egui_extras/src/loaders/svg_loader.rs @@ -14,7 +14,7 @@ pub struct SvgLoader { } impl SvgLoader { - pub const ID: &str = egui::generate_loader_id!(SvgLoader); + pub const ID: &'static str = egui::generate_loader_id!(SvgLoader); } fn is_supported(uri: &str) -> bool { diff --git a/crates/epaint/src/util/ordered_float.rs b/crates/epaint/src/util/ordered_float.rs index 0b305ca1..2c348e59 100644 --- a/crates/epaint/src/util/ordered_float.rs +++ b/crates/epaint/src/util/ordered_float.rs @@ -35,19 +35,16 @@ impl PartialEq for OrderedFloat { impl PartialOrd for OrderedFloat { #[inline] fn partial_cmp(&self, other: &Self) -> Option { - match self.0.partial_cmp(&other.0) { - Some(ord) => Some(ord), - None => Some(self.0.is_nan().cmp(&other.0.is_nan())), - } + Some(self.cmp(other)) } } impl Ord for OrderedFloat { #[inline] fn cmp(&self, other: &Self) -> Ordering { - match self.partial_cmp(other) { + match self.0.partial_cmp(&other.0) { Some(ord) => ord, - None => unreachable!(), + None => self.0.is_nan().cmp(&other.0.is_nan()), } } }