From 15b0214dffe878d4f2c11f6ac37fecb6ad337116 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Fri, 20 Nov 2020 12:28:24 +0100 Subject: [PATCH] clippy fixes --- egui/src/math/mod.rs | 2 +- egui/src/widgets/drag_value.rs | 6 +----- egui/src/widgets/mod.rs | 2 +- egui/src/widgets/slider.rs | 6 +----- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/egui/src/math/mod.rs b/egui/src/math/mod.rs index 7cd2e369..2cb8f867 100644 --- a/egui/src/math/mod.rs +++ b/egui/src/math/mod.rs @@ -125,7 +125,7 @@ pub fn round_to_precision(value: f64, decimal_places: usize) -> f64 { // This is a stupid way of doing this, but stupid works. format!("{:.*}", decimal_places, value) .parse() - .unwrap_or_else(|_| value) + .unwrap_or(value) } pub fn format_with_minimum_precision(value: f32, precision: usize) -> String { diff --git a/egui/src/widgets/drag_value.rs b/egui/src/widgets/drag_value.rs index 3360f039..36e46446 100644 --- a/egui/src/widgets/drag_value.rs +++ b/egui/src/widgets/drag_value.rs @@ -122,11 +122,7 @@ impl<'a> Widget for DragValue<'a> { if is_kb_editing { let button_width = ui.style().spacing.interact_size.x; - let mut value_text = ui - .memory() - .temp_edit_string - .take() - .unwrap_or_else(|| value_text); + let mut value_text = ui.memory().temp_edit_string.take().unwrap_or(value_text); let response = ui.add( TextEdit::singleline(&mut value_text) .id(kb_edit_id) diff --git a/egui/src/widgets/mod.rs b/egui/src/widgets/mod.rs index 63b088ac..4006324d 100644 --- a/egui/src/widgets/mod.rs +++ b/egui/src/widgets/mod.rs @@ -119,7 +119,7 @@ impl Label { /// Read the text style, or get the default for the current style pub fn text_style_or_default(&self, style: &Style) -> TextStyle { - self.text_style.unwrap_or_else(|| style.body_text_style) + self.text_style.unwrap_or(style.body_text_style) } } diff --git a/egui/src/widgets/slider.rs b/egui/src/widgets/slider.rs index 5e38956a..afe523fd 100644 --- a/egui/src/widgets/slider.rs +++ b/egui/src/widgets/slider.rs @@ -303,11 +303,7 @@ impl<'a> Slider<'a> { if is_kb_editing { let button_width = ui.style().spacing.interact_size.x; - let mut value_text = ui - .memory() - .temp_edit_string - .take() - .unwrap_or_else(|| value_text); + let mut value_text = ui.memory().temp_edit_string.take().unwrap_or(value_text); ui.add( TextEdit::singleline(&mut value_text) .id(kb_edit_id)