From b9db941e235119f54639d674480ddb9e5dfa6cc3 Mon Sep 17 00:00:00 2001
From: Okko Hakola <okkohakola@gmail.com>
Date: Sat, 23 Mar 2024 13:55:29 +0200
Subject: [PATCH] New clippy fixes (#68)

---
 examples/demo_app.rs                       | 2 +-
 examples/minimal.rs                        | 2 +-
 examples/multisample.rs                    | 7 ++-----
 examples/paint_callback.rs                 | 4 ++--
 examples/subpass.rs                        | 7 ++-----
 examples/wholesome/frame_system.rs         | 2 +-
 examples/wholesome/main.rs                 | 2 +-
 examples/wholesome/triangle_draw_system.rs | 2 +-
 src/renderer.rs                            | 5 +----
 9 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/examples/demo_app.rs b/examples/demo_app.rs
index f134dbd..d35ac7d 100644
--- a/examples/demo_app.rs
+++ b/examples/demo_app.rs
@@ -7,7 +7,7 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-use egui_winit_vulkano::{egui, Gui, GuiConfig};
+use egui_winit_vulkano::{Gui, GuiConfig};
 use vulkano_util::{
     context::{VulkanoConfig, VulkanoContext},
     window::{VulkanoWindows, WindowDescriptor},
diff --git a/examples/minimal.rs b/examples/minimal.rs
index 94ba0e2..f16ef0a 100644
--- a/examples/minimal.rs
+++ b/examples/minimal.rs
@@ -10,7 +10,7 @@
 #![allow(clippy::eq_op)]
 
 use egui::{ScrollArea, TextEdit, TextStyle};
-use egui_winit_vulkano::{egui, Gui, GuiConfig};
+use egui_winit_vulkano::{Gui, GuiConfig};
 use vulkano_util::{
     context::{VulkanoConfig, VulkanoContext},
     window::{VulkanoWindows, WindowDescriptor},
diff --git a/examples/multisample.rs b/examples/multisample.rs
index 2eb798e..55a27e0 100644
--- a/examples/multisample.rs
+++ b/examples/multisample.rs
@@ -9,13 +9,10 @@
 
 #![allow(clippy::eq_op)]
 
-use std::{
-    convert::{TryFrom, TryInto},
-    sync::Arc,
-};
+use std::sync::Arc;
 
 use egui::{epaint::Shadow, style::Margin, vec2, Align, Align2, Color32, Frame, Rounding, Window};
-use egui_winit_vulkano::{egui, Gui, GuiConfig};
+use egui_winit_vulkano::{Gui, GuiConfig};
 use vulkano::{
     buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
     command_buffer::{
diff --git a/examples/paint_callback.rs b/examples/paint_callback.rs
index 67fc097..1599d76 100644
--- a/examples/paint_callback.rs
+++ b/examples/paint_callback.rs
@@ -7,10 +7,10 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-use std::{convert::TryInto, sync::Arc};
+use std::sync::Arc;
 
 use egui::{mutex::Mutex, vec2, PaintCallback, PaintCallbackInfo, Rgba, Sense};
-use egui_winit_vulkano::{egui, CallbackContext, CallbackFn, Gui, GuiConfig, RenderResources};
+use egui_winit_vulkano::{CallbackContext, CallbackFn, Gui, GuiConfig, RenderResources};
 use vulkano::{
     buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
     memory::allocator::{AllocationCreateInfo, MemoryTypeFilter},
diff --git a/examples/subpass.rs b/examples/subpass.rs
index 77d13c6..ccb5199 100644
--- a/examples/subpass.rs
+++ b/examples/subpass.rs
@@ -9,13 +9,10 @@
 
 #![allow(clippy::eq_op)]
 
-use std::{
-    convert::{TryFrom, TryInto},
-    sync::Arc,
-};
+use std::sync::Arc;
 
 use egui::{epaint::Shadow, style::Margin, vec2, Align, Align2, Color32, Frame, Rounding, Window};
-use egui_winit_vulkano::{egui, Gui, GuiConfig};
+use egui_winit_vulkano::{Gui, GuiConfig};
 use vulkano::{
     buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
     command_buffer::{
diff --git a/examples/wholesome/frame_system.rs b/examples/wholesome/frame_system.rs
index c6e146b..0bb047f 100644
--- a/examples/wholesome/frame_system.rs
+++ b/examples/wholesome/frame_system.rs
@@ -11,7 +11,7 @@
 // https://github.com/vulkano-rs/vulkano-examples/blob/master/src/bin/deferred/frame/system.rs
 // Egui drawing could be its own pass or it could be a deferred subpass
 
-use std::{convert::TryFrom, sync::Arc};
+use std::sync::Arc;
 
 use cgmath::Matrix4;
 use vulkano::{
diff --git a/examples/wholesome/main.rs b/examples/wholesome/main.rs
index 91e11a0..7263c2f 100644
--- a/examples/wholesome/main.rs
+++ b/examples/wholesome/main.rs
@@ -12,7 +12,7 @@
 use std::sync::Arc;
 
 use egui::{load::SizedTexture, Context, ImageSource, Visuals};
-use egui_winit_vulkano::{egui, Gui, GuiConfig};
+use egui_winit_vulkano::{Gui, GuiConfig};
 use vulkano::{
     command_buffer::allocator::{
         StandardCommandBufferAllocator, StandardCommandBufferAllocatorCreateInfo,
diff --git a/examples/wholesome/triangle_draw_system.rs b/examples/wholesome/triangle_draw_system.rs
index fdd327d..cbeb8a0 100644
--- a/examples/wholesome/triangle_draw_system.rs
+++ b/examples/wholesome/triangle_draw_system.rs
@@ -11,7 +11,7 @@
 // https://github.com/vulkano-rs/vulkano-examples/blob/master/src/bin/deferred/triangle_draw_system.rs
 // To simplify this wholesome example :)
 
-use std::{convert::TryInto, sync::Arc};
+use std::sync::Arc;
 
 use vulkano::{
     buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
diff --git a/src/renderer.rs b/src/renderer.rs
index 2ccd94b..9158ddc 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -7,10 +7,7 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-use std::{
-    convert::{TryFrom, TryInto},
-    sync::Arc,
-};
+use std::sync::Arc;
 
 use ahash::AHashMap;
 use egui::{epaint::Primitive, ClippedPrimitive, PaintCallbackInfo, Rect, TexturesDelta};