From e267e075ccd35ae3ca357ae4143796e68c1ad392 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 19 May 2023 04:02:18 +0200 Subject: Avoid redundant `buffer::Buffer` import --- wgpu/src/image.rs | 2 +- wgpu/src/lib.rs | 2 ++ wgpu/src/quad.rs | 4 ++-- wgpu/src/triangle.rs | 7 +++---- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'wgpu') diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index c3479652..3407aa92 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -8,10 +8,10 @@ mod vector; use atlas::Atlas; -use crate::buffer::Buffer; use crate::core::{Rectangle, Size}; use crate::graphics::Transformation; use crate::layer; +use crate::Buffer; use std::cell::RefCell; use std::mem; diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index c05280a6..571d2718 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -50,6 +50,8 @@ mod quad; mod text; mod triangle; +use buffer::Buffer; + pub use iced_graphics as graphics; pub use iced_graphics::core; diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs index 83ea8e1f..e35aebc9 100644 --- a/wgpu/src/quad.rs +++ b/wgpu/src/quad.rs @@ -195,9 +195,9 @@ impl Layer { } mod solid { - use crate::buffer::Buffer; use crate::layer::quad; use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES}; + use crate::Buffer; #[derive(Debug)] pub struct Pipeline { @@ -324,9 +324,9 @@ mod solid { } mod gradient { - use crate::buffer::Buffer; use crate::layer::quad; use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES}; + use crate::Buffer; #[derive(Debug)] pub struct Pipeline { diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs index 0d1fead1..6cd54ef7 100644 --- a/wgpu/src/triangle.rs +++ b/wgpu/src/triangle.rs @@ -1,10 +1,10 @@ //! Draw meshes of triangles. mod msaa; -use crate::buffer::Buffer; use crate::core::Size; use crate::graphics::{Antialiasing, Transformation}; use crate::layer::mesh::{self, Mesh}; +use crate::Buffer; const INITIAL_INDEX_COUNT: usize = 1_000; const INITIAL_VERTEX_COUNT: usize = 1_000; @@ -389,10 +389,10 @@ impl Uniforms { } mod solid { - use crate::buffer::Buffer; use crate::graphics::primitive; use crate::graphics::Antialiasing; use crate::triangle; + use crate::Buffer; #[derive(Debug)] pub struct Pipeline { @@ -533,8 +533,7 @@ mod solid { mod gradient { use crate::graphics::{primitive, Antialiasing}; use crate::triangle; - - use crate::buffer::Buffer; + use crate::Buffer; #[derive(Debug)] pub struct Pipeline { -- cgit