From 7122366a43b2534800c664574fcef0746231f4b6 Mon Sep 17 00:00:00 2001 From: Jack Spira Date: Sat, 4 Sep 2021 16:56:30 -0700 Subject: [PATCH] fixing the stunning amount of clippy errors --- imgui-examples/examples/collapsing_header.rs | 14 ++--- imgui-examples/examples/progress_bar.rs | 2 +- imgui-examples/examples/radio_button.rs | 6 +- imgui-examples/examples/slider.rs | 20 +++---- imgui-examples/examples/test_window_impl.rs | 58 ++++++++++---------- imgui-gfx-renderer/build.rs | 4 +- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/imgui-examples/examples/collapsing_header.rs b/imgui-examples/examples/collapsing_header.rs index 29785ba..8c4e7c4 100644 --- a/imgui-examples/examples/collapsing_header.rs +++ b/imgui-examples/examples/collapsing_header.rs @@ -12,8 +12,8 @@ fn main() { .opened(run) .position([20.0, 20.0], Condition::Appearing) .size([700.0, 500.0], Condition::Appearing); - w.build(&ui, || { - if CollapsingHeader::new(im_str!("I'm a collapsing header. Click me!")).build(&ui) { + w.build(ui, || { + if CollapsingHeader::new(im_str!("I'm a collapsing header. Click me!")).build(ui) { ui.text( "A collapsing header can be used to toggle rendering of a group of widgets", ); @@ -22,7 +22,7 @@ fn main() { ui.spacing(); if CollapsingHeader::new(im_str!("I'm open by default")) .default_open(true) - .build(&ui) + .build(ui) { ui.text("You can still close me with a click!"); } @@ -30,7 +30,7 @@ fn main() { ui.spacing(); if CollapsingHeader::new(im_str!("I only open with double-click")) .open_on_double_click(true) - .build(&ui) + .build(ui) { ui.text("Double the clicks, double the fun!"); } @@ -38,7 +38,7 @@ fn main() { ui.spacing(); if CollapsingHeader::new(im_str!("I don't have an arrow")) .bullet(true) - .build(&ui) + .build(ui) { ui.text("Collapsing headers can use a bullet instead of an arrow"); } @@ -46,7 +46,7 @@ fn main() { ui.spacing(); if CollapsingHeader::new(im_str!("I only open if you click the arrow")) .open_on_arrow(true) - .build(&ui) + .build(ui) { ui.text("You clicked the arrow"); } @@ -57,7 +57,7 @@ fn main() { &mut state.render_closable, ); if CollapsingHeader::new(im_str!("I've got a separate close button")) - .build_with_close_button(&ui, &mut state.render_closable) + .build_with_close_button(ui, &mut state.render_closable) { ui.text("I've got contents just like any other collapsing header"); } diff --git a/imgui-examples/examples/progress_bar.rs b/imgui-examples/examples/progress_bar.rs index f0a5868..b5bd9db 100644 --- a/imgui-examples/examples/progress_bar.rs +++ b/imgui-examples/examples/progress_bar.rs @@ -9,7 +9,7 @@ fn main() { .opened(run) .position([20.0, 20.0], Condition::Appearing) .size([700.0, 200.0], Condition::Appearing); - w.build(&ui, || { + w.build(ui, || { ui.text("This is a simple progress bar:"); ProgressBar::new(0.5).build(ui); diff --git a/imgui-examples/examples/radio_button.rs b/imgui-examples/examples/radio_button.rs index 70e395c..d968c1d 100644 --- a/imgui-examples/examples/radio_button.rs +++ b/imgui-examples/examples/radio_button.rs @@ -21,7 +21,7 @@ fn example_selector(run: &mut bool, ui: &mut Ui, state: &mut State) { .position([20.0, 20.0], Condition::Appearing) .size([700.0, 80.0], Condition::Appearing) .resizable(false); - w.build(&ui, || { + w.build(ui, || { let mut clicked = false; clicked |= ui.radio_button( im_str!("Example 1: Boolean radio buttons"), @@ -39,7 +39,7 @@ fn example_1(ui: &Ui, state: &mut State) { let w = Window::new(im_str!("Example 1: Boolean radio buttons")) .size([700.0, 200.0], Condition::Appearing) .position([20.0, 120.0], Condition::Appearing); - w.build(&ui, || { + w.build(ui, || { ui.text_wrapped(im_str!( "Boolean radio buttons accept a boolean active state, which is passed as a value and \ not as a mutable reference. This means that it's not updated automatically, so you \ @@ -65,7 +65,7 @@ fn example_2(ui: &Ui, state: &mut State) { let w = Window::new(im_str!("Example 2: Radio buttons")) .size([700.0, 300.0], Condition::Appearing) .position([20.0, 120.0], Condition::Appearing); - w.build(&ui, || { + w.build(ui, || { ui.text_wrapped(im_str!( "Normal radio buttons accept a mutable reference to state, and the value \ corresponding to this button. They are very flexible, because the value can be any \ diff --git a/imgui-examples/examples/slider.rs b/imgui-examples/examples/slider.rs index 2968504..691a4fe 100644 --- a/imgui-examples/examples/slider.rs +++ b/imgui-examples/examples/slider.rs @@ -21,7 +21,7 @@ fn example_selector(run: &mut bool, ui: &mut Ui, state: &mut State) { .position([20.0, 20.0], Condition::Appearing) .size([700.0, 80.0], Condition::Appearing) .resizable(false); - w.build(&ui, || { + w.build(ui, || { let mut clicked = false; clicked |= ui.radio_button(im_str!("Example 1: Basic sliders"), &mut state.example, 1); clicked |= ui.radio_button(im_str!("Example 2: Slider arrays"), &mut state.example, 2); @@ -35,23 +35,23 @@ fn example_1(ui: &Ui, state: &mut State) { let w = Window::new(im_str!("Example 1: Basic sliders")) .size([700.0, 340.0], Condition::Appearing) .position([20.0, 120.0], Condition::Appearing); - w.build(&ui, || { + w.build(ui, || { ui.text("All of the following data types are supported:"); ui.text("Signed: i8 i16 i32 i64"); ui.text("Unsigned: u8 u16 u32 u64"); ui.text("Floats: f32 f64"); Slider::new(im_str!("u8 value")) - .build(&ui, &mut state.u8_value); + .build(ui, &mut state.u8_value); Slider::new(im_str!("f32 value")) - .build(&ui, &mut state.f32_value); + .build(ui, &mut state.f32_value); ui.separator(); ui.text("Slider range can be limited:"); Slider::new(im_str!("i32 value with range")) .range(-999 ..= 999) - .build(&ui, &mut state.i32_value); + .build(ui, &mut state.i32_value); ui.text("Note that for 32-bit/64-bit types, sliders are always limited to half of the natural type range!"); ui.separator(); @@ -59,12 +59,12 @@ fn example_1(ui: &Ui, state: &mut State) { Slider::new(im_str!("f64 value with custom formatting")) .range(-999_999_999.0 ..= 999_999_999.0) .display_format(im_str!("%09.0f")) - .build(&ui, &mut state.f64_formatted); + .build(ui, &mut state.f64_formatted); ui.separator(); ui.text("Vertical sliders require a size parameter but otherwise work in a similar way:"); VerticalSlider::new(im_str!("vertical\nu8 value"), [50.0, 50.0]) - .build(&ui, &mut state.u8_value); + .build(ui, &mut state.u8_value); }); } @@ -72,13 +72,13 @@ fn example_2(ui: &Ui, state: &mut State) { let w = Window::new(im_str!("Example 2: Slider arrays")) .size([700.0, 260.0], Condition::Appearing) .position([20.0, 120.0], Condition::Appearing); - w.build(&ui, || { + w.build(ui, || { ui.text("You can easily build a slider group from an array of values:"); - Slider::new(im_str!("[u8; 4]")).build_array(&ui, &mut state.array); + Slider::new(im_str!("[u8; 4]")).build_array(ui, &mut state.array); ui.text("You don't need to use arrays with known length; arbitrary slices can be used:"); let slice: &mut [u8] = &mut state.array[1..=2]; - Slider::new(im_str!("subslice")).build_array(&ui, slice); + Slider::new(im_str!("subslice")).build_array(ui, slice); }); } diff --git a/imgui-examples/examples/test_window_impl.rs b/imgui-examples/examples/test_window_impl.rs index e24f673..0704d68 100644 --- a/imgui-examples/examples/test_window_impl.rs +++ b/imgui-examples/examples/test_window_impl.rs @@ -377,7 +377,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { menu_bar.end(); } ui.spacing(); - if CollapsingHeader::new(im_str!("Help")).build(&ui) { + if CollapsingHeader::new(im_str!("Help")).build(ui) { ui.text_wrapped(im_str!( "This window is being created by the show_test_window() \ function. Please refer to the code for programming \ @@ -386,7 +386,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { show_user_guide(ui); } - if CollapsingHeader::new(im_str!("Window options")).build(&ui) { + if CollapsingHeader::new(im_str!("Window options")).build(ui) { ui.checkbox(im_str!("No titlebar"), &mut state.no_titlebar); ui.same_line_with_pos(150.0); ui.checkbox(im_str!("No scrollbar"), &mut state.no_scrollbar); @@ -399,14 +399,14 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { ui.checkbox(im_str!("No collapse"), &mut state.no_collapse); ui.checkbox(im_str!("No close"), &mut state.no_close); - TreeNode::new(im_str!("Style")).build(&ui, || { + TreeNode::new(im_str!("Style")).build(ui, || { ui.show_default_style_editor(); }); } - if CollapsingHeader::new(im_str!("Widgets")).build(&ui) { - TreeNode::new(im_str!("Tree")).build(&ui, || { + if CollapsingHeader::new(im_str!("Widgets")).build(ui) { + TreeNode::new(im_str!("Tree")).build(ui, || { for i in 0..5 { - TreeNode::new(&im_str!("Child {}", i)).build(&ui, || { + TreeNode::new(&im_str!("Child {}", i)).build(ui, || { ui.text(im_str!("blah blah")); ui.same_line(); if ui.small_button(im_str!("print")) { @@ -416,7 +416,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { } }); - TreeNode::new(im_str!("Bullets")).build(&ui, || { + TreeNode::new(im_str!("Bullets")).build(ui, || { ui.bullet_text(im_str!("Bullet point 1")); ui.bullet_text(im_str!("Bullet point 2\nOn multiple lines")); ui.bullet(); @@ -425,13 +425,13 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { ui.bullet(); ui.small_button(im_str!("Button")); }); - TreeNode::new(im_str!("Colored text")).build(&ui, || { + TreeNode::new(im_str!("Colored text")).build(ui, || { ui.text_colored([1.0, 0.0, 1.0, 1.0], im_str!("Pink")); ui.text_colored([1.0, 1.0, 0.0, 1.0], im_str!("Yellow")); ui.text_disabled(im_str!("Disabled")); }); - TreeNode::new(im_str!("Multi-line text")).build(&ui, || { + TreeNode::new(im_str!("Multi-line text")).build(ui, || { ui.input_text_multiline( im_str!("multiline"), &mut state.text_multiline, @@ -439,7 +439,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { ).build(); }); - TreeNode::new(im_str!("Word wrapping")).build(&ui, || { + TreeNode::new(im_str!("Word wrapping")).build(ui, || { ui.text_wrapped(im_str!( "This text should automatically wrap on the edge of \ the window.The current implementation for text \ @@ -458,7 +458,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { ui.text(im_str!("Test paragraph 2:")); // TODO }); - TreeNode::new(im_str!("UTF-8 Text")).build(&ui, || { + TreeNode::new(im_str!("UTF-8 Text")).build(ui, || { ui.text_wrapped(im_str!( "CJK text will only appear if the font was loaded \ with theappropriate CJK character ranges. Call \ @@ -551,7 +551,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { ColorEdit::new(im_str!("color 1"), &mut state.col1).build(ui); ColorEdit::new(im_str!("color 2"), &mut state.col2).build(ui); - TreeNode::new(im_str!("Multi-component Widgets")).build(&ui, || { + TreeNode::new(im_str!("Multi-component Widgets")).build(ui, || { ui.input_float2(im_str!("input float2"), &mut state.vec2f) .build(); ui.input_int2(im_str!("input int2"), &mut state.vec2i) @@ -565,7 +565,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) { ui.spacing(); }); - TreeNode::new(im_str!("Color/Picker Widgets")).build(&ui, || { + TreeNode::new(im_str!("Color/Picker Widgets")).build(ui, || { let s = &mut state.color_edit; ui.checkbox(im_str!("With HDR"), &mut s.hdr); ui.same_line(); @@ -667,26 +667,26 @@ CTRL+click on individual component to input value.\n", }); } - if CollapsingHeader::new(im_str!("Layout")).build(&ui) { - TreeNode::new(im_str!("Tabs")).build(&ui, || { - TreeNode::new(im_str!("Basic")).build(&ui, || { - TabBar::new(im_str!("basictabbar")).build(&ui, || { - TabItem::new(im_str!("Avocado")).build(&ui, || { + if CollapsingHeader::new(im_str!("Layout")).build(ui) { + TreeNode::new(im_str!("Tabs")).build(ui, || { + TreeNode::new(im_str!("Basic")).build(ui, || { + TabBar::new(im_str!("basictabbar")).build(ui, || { + TabItem::new(im_str!("Avocado")).build(ui, || { ui.text(im_str!("This is the Avocado tab!")); ui.text(im_str!("blah blah blah blah blah")); }); - TabItem::new(im_str!("Broccoli")).build(&ui, || { + TabItem::new(im_str!("Broccoli")).build(ui, || { ui.text(im_str!("This is the Broccoli tab!")); ui.text(im_str!("blah blah blah blah blah")); }); - TabItem::new(im_str!("Cucumber")).build(&ui, || { + TabItem::new(im_str!("Cucumber")).build(ui, || { ui.text(im_str!("This is the Cucumber tab!")); ui.text(im_str!("blah blah blah blah blah")); }); }); }); - TreeNode::new(im_str!("Advanced & Close button")).build(&ui, || { + TreeNode::new(im_str!("Advanced & Close button")).build(ui, || { ui.separator(); let s = &mut state.tabs; @@ -722,17 +722,17 @@ CTRL+click on individual component to input value.\n", f }; - TabBar::new(im_str!("tabbar")).flags(flags).build(&ui, || { - TabItem::new(im_str!("Artichoke")).opened(&mut s.artichoke_tab).build(&ui, || { + TabBar::new(im_str!("tabbar")).flags(flags).build(ui, || { + TabItem::new(im_str!("Artichoke")).opened(&mut s.artichoke_tab).build(ui, || { ui.text(im_str!("This is the Artichoke tab!")); }); - TabItem::new(im_str!("Beetroot")).opened(&mut s.beetroot_tab).build(&ui, || { + TabItem::new(im_str!("Beetroot")).opened(&mut s.beetroot_tab).build(ui, || { ui.text(im_str!("This is the Beetroot tab!")); }); - TabItem::new(im_str!("Celery")).opened(&mut s.celery_tab).build(&ui, || { + TabItem::new(im_str!("Celery")).opened(&mut s.celery_tab).build(ui, || { ui.text(im_str!("This is the Celery tab!")); }); - TabItem::new(im_str!("Daikon")).opened(&mut s.daikon_tab).build(&ui, || { + TabItem::new(im_str!("Daikon")).opened(&mut s.daikon_tab).build(ui, || { ui.text(im_str!("This is the Daikon tab!")); }); }); @@ -740,8 +740,8 @@ CTRL+click on individual component to input value.\n", }); }); } - if CollapsingHeader::new(im_str!("Popups & Modal windows")).build(&ui) { - TreeNode::new(im_str!("Popups")).build(&ui, || { + if CollapsingHeader::new(im_str!("Popups & Modal windows")).build(ui) { + TreeNode::new(im_str!("Popups")).build(ui, || { ui.text_wrapped(im_str!( "When a popup is active, it inhibits interacting \ with windows that are behind the popup. Clicking \ @@ -773,7 +773,7 @@ CTRL+click on individual component to input value.\n", }); }); - TreeNode::new(im_str!("Modals")).build(&ui, || { + TreeNode::new(im_str!("Modals")).build(ui, || { ui.text_wrapped(im_str!( "Modal windows are like popups but the user cannot close \ them by clicking outside the window." diff --git a/imgui-gfx-renderer/build.rs b/imgui-gfx-renderer/build.rs index 93757f4..bd54051 100644 --- a/imgui-gfx-renderer/build.rs +++ b/imgui-gfx-renderer/build.rs @@ -39,7 +39,7 @@ mod hlsl_build { } fs::write( vertex_destination, - compile_shader(&src_data, &source_path, "VertexMain", "vs_4_0").unwrap_or_else( + compile_shader(&src_data, source_path, "VertexMain", "vs_4_0").unwrap_or_else( |error_message| { eprintln!("{}", error_message); panic!("Vertex shader failed to compile"); @@ -53,7 +53,7 @@ mod hlsl_build { } fs::write( pixel_destination, - compile_shader(&src_data, &source_path, "PixelMain", "ps_4_0").unwrap_or_else( + compile_shader(&src_data, source_path, "PixelMain", "ps_4_0").unwrap_or_else( |error_message| { eprintln!("{}", error_message); panic!("Pixel shader failed to compile");