From f31c8f2504ea7c004c5caed8913e5da28d2e50e2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 06:05:23 +0100
Subject: Refactor imports of `triangle` modules in `iced_glow` and `iced_wgpu`

---
 glow/src/triangle.rs |  7 +++----
 wgpu/src/triangle.rs | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/glow/src/triangle.rs b/glow/src/triangle.rs
index 5d14666c..0e27bcf2 100644
--- a/glow/src/triangle.rs
+++ b/glow/src/triangle.rs
@@ -2,16 +2,15 @@
 mod gradient;
 mod solid;
 
-use crate::{program, Transformation};
+use crate::program;
+use crate::Transformation;
 
 use iced_graphics::layer::mesh::{self, Mesh};
-use iced_graphics::triangle;
+use iced_graphics::triangle::{self, Vertex2D};
 
 use glow::HasContext;
 use std::marker::PhantomData;
 
-pub use iced_graphics::triangle::{Mesh2D, Vertex2D};
-
 #[derive(Debug)]
 pub(crate) struct Pipeline {
     vertex_array: <glow::Context as HasContext>::VertexArray,
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 765f7d30..f9abf2b5 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -1,18 +1,18 @@
 //! Draw meshes of triangles.
-use crate::{settings, Transformation};
-use core::fmt;
-use std::fmt::Formatter;
+mod gradient;
+mod msaa;
+mod solid;
+
+use crate::buffer::r#static::Buffer;
+use crate::settings;
+use crate::Transformation;
 
 use iced_graphics::layer::mesh::{self, Mesh};
-use iced_graphics::triangle;
+use iced_graphics::triangle::{self, Vertex2D};
 use iced_graphics::Size;
 
-use crate::buffer::r#static::Buffer;
-pub use iced_graphics::triangle::{Mesh2D, Vertex2D};
-
-mod gradient;
-mod msaa;
-mod solid;
+use core::fmt;
+use std::fmt::Formatter;
 
 /// Triangle pipeline for all mesh layers in a [`iced_graphics::Canvas`] widget.
 #[derive(Debug)]
-- 
cgit