Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New clippy fixes #68

Merged
merged 1 commit into from
Mar 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/demo_app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
7 changes: 2 additions & 5 deletions examples/multisample.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
4 changes: 2 additions & 2 deletions examples/paint_callback.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
7 changes: 2 additions & 5 deletions examples/subpass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion examples/wholesome/frame_system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion examples/wholesome/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion examples/wholesome/triangle_draw_system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
5 changes: 1 addition & 4 deletions src/renderer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Loading