From fd3444473f3b8ea52fae7ddc43f2527139ac562f Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Tue, 23 Mar 2021 19:53:31 +0100 Subject: [PATCH] Add some clippy lints --- egui/src/data/output.rs | 3 +-- egui/src/grid.rs | 1 + egui/src/lib.rs | 17 +++++++++--- egui/src/widgets/slider.rs | 1 + egui_demo_lib/src/apps/demo/layout_test.rs | 30 +++++++++++----------- egui_demo_lib/src/lib.rs | 18 ++++++++++--- emath/src/lib.rs | 17 +++++++++--- epaint/src/lib.rs | 17 +++++++++--- epaint/src/shape_transform.rs | 1 + epi/src/lib.rs | 23 +++++++++++------ 10 files changed, 87 insertions(+), 41 deletions(-) diff --git a/egui/src/data/output.rs b/egui/src/data/output.rs index 5e8d2866..9b17a824 100644 --- a/egui/src/data/output.rs +++ b/egui/src/data/output.rs @@ -327,7 +327,6 @@ impl WidgetInfo { // TODO: localization let widget_name = match typ { - WidgetType::Label => "", WidgetType::Hyperlink => "link", WidgetType::TextEdit => "text edit", WidgetType::Button => "button", @@ -340,7 +339,7 @@ impl WidgetInfo { WidgetType::ColorButton => "color button", WidgetType::ImageButton => "image button", WidgetType::CollapsingHeader => "collapsing header", - WidgetType::Other => "", + WidgetType::Label | WidgetType::Other => "", }; let mut description = widget_name.to_owned(); diff --git a/egui/src/grid.rs b/egui/src/grid.rs index 213bd6c7..d321d5f7 100644 --- a/egui/src/grid.rs +++ b/egui/src/grid.rs @@ -138,6 +138,7 @@ impl GridLayout { Rect::from_min_size(cursor.min, size) } + #[allow(clippy::unused_self)] pub(crate) fn align_size_within_rect(&self, size: Vec2, frame: Rect) -> Rect { // TODO: allow this alignment to be customized Align2::LEFT_CENTER.align_size_within_rect(size, frame) diff --git a/egui/src/lib.rs b/egui/src/lib.rs index bf4d0e83..906067db 100644 --- a/egui/src/lib.rs +++ b/egui/src/lib.rs @@ -233,19 +233,26 @@ clippy::all, clippy::await_holding_lock, clippy::dbg_macro, + clippy::debug_assert_with_mut_call, clippy::doc_markdown, clippy::empty_enum, clippy::enum_glob_use, clippy::exit, + clippy::explicit_into_iter_loop, clippy::filter_map_next, clippy::fn_params_excessive_bools, clippy::if_let_mutex, clippy::imprecise_flops, clippy::inefficient_to_string, + clippy::large_types_passed_by_value, + clippy::let_unit_value, clippy::linkedlist, clippy::lossy_float_literal, clippy::macro_use_imports, + clippy::map_err_ignore, + clippy::map_flatten, clippy::match_on_vec_items, + clippy::match_same_arms, clippy::match_wildcard_for_single_variants, clippy::mem_forget, clippy::mismatched_target_os, @@ -256,18 +263,20 @@ clippy::needless_pass_by_value, clippy::option_option, clippy::pub_enum_variant_names, + clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, + clippy::string_add_assign, + clippy::string_add, + clippy::string_to_string, clippy::todo, clippy::unimplemented, clippy::unnested_or_patterns, + clippy::unused_self, clippy::verbose_file_reads, future_incompatible, missing_crate_level_docs, - missing_doc_code_examples, - // missing_docs, nonstandard_style, - rust_2018_idioms, - unused_doc_comments, + rust_2018_idioms )] #![allow(clippy::manual_range_contains)] diff --git a/egui/src/widgets/slider.rs b/egui/src/widgets/slider.rs index 1f7edbda..396ab4ac 100644 --- a/egui/src/widgets/slider.rs +++ b/egui/src/widgets/slider.rs @@ -303,6 +303,7 @@ fn x_range(rect: &Rect) -> RangeInclusive { impl<'a> Slider<'a> { /// Just the slider, no text + #[allow(clippy::unused_self)] fn allocate_slider_space(&self, ui: &mut Ui, height: f32) -> Response { let desired_size = vec2(ui.spacing().slider_width, height); ui.allocate_response(desired_size, Sense::click_and_drag()) diff --git a/egui_demo_lib/src/apps/demo/layout_test.rs b/egui_demo_lib/src/apps/demo/layout_test.rs index d2427843..3cfbf720 100644 --- a/egui_demo_lib/src/apps/demo/layout_test.rs +++ b/egui_demo_lib/src/apps/demo/layout_test.rs @@ -57,7 +57,7 @@ impl super::View for LayoutTest { ui.available_size_before_wrap_finite().x, self.wrap_row_height, ), - |ui| ui.with_layout(self.layout(), |ui| self.demo_ui(ui)), + |ui| ui.with_layout(self.layout(), demo_ui), ); } else { ui.allocate_ui( @@ -65,11 +65,11 @@ impl super::View for LayoutTest { self.wrap_column_width, ui.available_size_before_wrap_finite().y, ), - |ui| ui.with_layout(self.layout(), |ui| self.demo_ui(ui)), + |ui| ui.with_layout(self.layout(), demo_ui), ); } } else { - ui.with_layout(self.layout(), |ui| self.demo_ui(ui)); + ui.with_layout(self.layout(), demo_ui); } }); ui.label("Resize to see effect"); @@ -138,18 +138,18 @@ impl LayoutTest { ui.checkbox(&mut self.cross_justify, "Cross Justified") .on_hover_text("Try to fill full width/height (e.g. buttons)"); } +} - pub fn demo_ui(&mut self, ui: &mut Ui) { - ui.monospace("Example widgets:"); - for _ in 0..3 { - ui.label("label"); - } - for _ in 0..3 { - let mut dummy = false; - ui.checkbox(&mut dummy, "checkbox"); - } - for _ in 0..3 { - let _ = ui.button("button"); - } +fn demo_ui(ui: &mut Ui) { + ui.monospace("Example widgets:"); + for _ in 0..3 { + ui.label("label"); + } + for _ in 0..3 { + let mut dummy = false; + ui.checkbox(&mut dummy, "checkbox"); + } + for _ in 0..3 { + let _ = ui.button("button"); } } diff --git a/egui_demo_lib/src/lib.rs b/egui_demo_lib/src/lib.rs index db17fa4d..48fa0575 100644 --- a/egui_demo_lib/src/lib.rs +++ b/egui_demo_lib/src/lib.rs @@ -8,19 +8,26 @@ clippy::all, clippy::await_holding_lock, clippy::dbg_macro, + clippy::debug_assert_with_mut_call, clippy::doc_markdown, clippy::empty_enum, clippy::enum_glob_use, clippy::exit, + clippy::explicit_into_iter_loop, clippy::filter_map_next, clippy::fn_params_excessive_bools, clippy::if_let_mutex, clippy::imprecise_flops, clippy::inefficient_to_string, + clippy::large_types_passed_by_value, + clippy::let_unit_value, clippy::linkedlist, clippy::lossy_float_literal, clippy::macro_use_imports, + clippy::map_err_ignore, + clippy::map_flatten, clippy::match_on_vec_items, + clippy::match_same_arms, clippy::match_wildcard_for_single_variants, clippy::mem_forget, clippy::mismatched_target_os, @@ -31,19 +38,22 @@ clippy::needless_pass_by_value, clippy::option_option, clippy::pub_enum_variant_names, + clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, + clippy::string_add_assign, + clippy::string_add, + clippy::string_to_string, clippy::todo, clippy::unimplemented, clippy::unnested_or_patterns, + clippy::unused_self, clippy::verbose_file_reads, future_incompatible, missing_crate_level_docs, - missing_doc_code_examples, - // missing_docs, nonstandard_style, - rust_2018_idioms, - unused_doc_comments, + rust_2018_idioms )] +#![allow(clippy::manual_range_contains)] mod apps; pub(crate) mod frame_history; diff --git a/emath/src/lib.rs b/emath/src/lib.rs index 571009a4..44737993 100644 --- a/emath/src/lib.rs +++ b/emath/src/lib.rs @@ -15,19 +15,26 @@ clippy::all, clippy::await_holding_lock, clippy::dbg_macro, + clippy::debug_assert_with_mut_call, clippy::doc_markdown, clippy::empty_enum, clippy::enum_glob_use, clippy::exit, + clippy::explicit_into_iter_loop, clippy::filter_map_next, clippy::fn_params_excessive_bools, clippy::if_let_mutex, clippy::imprecise_flops, clippy::inefficient_to_string, + clippy::large_types_passed_by_value, + clippy::let_unit_value, clippy::linkedlist, clippy::lossy_float_literal, clippy::macro_use_imports, + clippy::map_err_ignore, + clippy::map_flatten, clippy::match_on_vec_items, + clippy::match_same_arms, clippy::match_wildcard_for_single_variants, clippy::mem_forget, clippy::mismatched_target_os, @@ -38,18 +45,20 @@ clippy::needless_pass_by_value, clippy::option_option, clippy::pub_enum_variant_names, + clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, + clippy::string_add_assign, + clippy::string_add, + clippy::string_to_string, clippy::todo, clippy::unimplemented, clippy::unnested_or_patterns, + clippy::unused_self, clippy::verbose_file_reads, future_incompatible, missing_crate_level_docs, - missing_doc_code_examples, - // missing_docs, nonstandard_style, - rust_2018_idioms, - unused_doc_comments, + rust_2018_idioms )] #![allow(clippy::manual_range_contains)] diff --git a/epaint/src/lib.rs b/epaint/src/lib.rs index 4fb844fd..157ff7b7 100644 --- a/epaint/src/lib.rs +++ b/epaint/src/lib.rs @@ -6,19 +6,26 @@ clippy::all, clippy::await_holding_lock, clippy::dbg_macro, + clippy::debug_assert_with_mut_call, clippy::doc_markdown, clippy::empty_enum, clippy::enum_glob_use, clippy::exit, + clippy::explicit_into_iter_loop, clippy::filter_map_next, clippy::fn_params_excessive_bools, clippy::if_let_mutex, clippy::imprecise_flops, clippy::inefficient_to_string, + clippy::large_types_passed_by_value, + clippy::let_unit_value, clippy::linkedlist, clippy::lossy_float_literal, clippy::macro_use_imports, + clippy::map_err_ignore, + clippy::map_flatten, clippy::match_on_vec_items, + clippy::match_same_arms, clippy::match_wildcard_for_single_variants, clippy::mem_forget, clippy::mismatched_target_os, @@ -29,18 +36,20 @@ clippy::needless_pass_by_value, clippy::option_option, clippy::pub_enum_variant_names, + clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, + clippy::string_add_assign, + clippy::string_add, + clippy::string_to_string, clippy::todo, clippy::unimplemented, clippy::unnested_or_patterns, + clippy::unused_self, clippy::verbose_file_reads, future_incompatible, missing_crate_level_docs, - missing_doc_code_examples, - // missing_docs, nonstandard_style, - rust_2018_idioms, - unused_doc_comments, + rust_2018_idioms )] #![allow(clippy::manual_range_contains)] diff --git a/epaint/src/shape_transform.rs b/epaint/src/shape_transform.rs index c33b1784..971a95f7 100644 --- a/epaint/src/shape_transform.rs +++ b/epaint/src/shape_transform.rs @@ -1,6 +1,7 @@ use crate::*; pub fn adjust_colors(shape: &mut Shape, adjust_color: &impl Fn(&mut Color32)) { + #![allow(clippy::match_same_arms)] match shape { Shape::Noop => {} Shape::Vec(shapes) => { diff --git a/epi/src/lib.rs b/epi/src/lib.rs index b89d3574..70d2e890 100644 --- a/epi/src/lib.rs +++ b/epi/src/lib.rs @@ -12,19 +12,26 @@ clippy::all, clippy::await_holding_lock, clippy::dbg_macro, + clippy::debug_assert_with_mut_call, clippy::doc_markdown, clippy::empty_enum, clippy::enum_glob_use, clippy::exit, + clippy::explicit_into_iter_loop, clippy::filter_map_next, clippy::fn_params_excessive_bools, clippy::if_let_mutex, clippy::imprecise_flops, clippy::inefficient_to_string, + clippy::large_types_passed_by_value, + clippy::let_unit_value, clippy::linkedlist, clippy::lossy_float_literal, clippy::macro_use_imports, + clippy::map_err_ignore, + clippy::map_flatten, clippy::match_on_vec_items, + clippy::match_same_arms, clippy::match_wildcard_for_single_variants, clippy::mem_forget, clippy::mismatched_target_os, @@ -35,18 +42,22 @@ clippy::needless_pass_by_value, clippy::option_option, clippy::pub_enum_variant_names, + clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, + clippy::string_add_assign, + clippy::string_add, + clippy::string_to_string, clippy::todo, clippy::unimplemented, clippy::unnested_or_patterns, + clippy::unused_self, clippy::verbose_file_reads, future_incompatible, missing_crate_level_docs, - missing_doc_code_examples, - missing_docs, - rust_2018_idioms, - unused_doc_comments + nonstandard_style, + rust_2018_idioms )] +#![allow(clippy::manual_range_contains)] pub use egui; // Re-export for user convenience @@ -172,10 +183,6 @@ impl<'a> Frame<'a> { self.0.output.window_size = Some(size); } - /// Use [`egui::Context::set_pixels_per_point`] instead - #[deprecated = "Use egui::Context::set_pixels_per_point instead"] - pub fn set_pixels_per_point(&mut self, _: f32) {} - /// If you need to request a repaint from another thread, clone this and send it to that other thread. pub fn repaint_signal(&self) -> std::sync::Arc { self.0.repaint_signal.clone()