Cargo fmt after path changes

nannou-org · Aug 6, 2019 · 6eb9d88 · 6eb9d88
1 parent 3a859e6
commit 6eb9d88
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/src/draw/drawing.rs b/src/draw/drawing.rs
@@ -48,7 +48,7 @@ pub struct DrawingContext<'a, S> {
     /// The intermediary mesh for buffering yet-to-be-drawn paths and meshes.
     pub mesh: &'a mut draw::IntermediaryMesh<S>,
     /// A re-usable fill tessellator for 2D paths.
-    pub fill_tessellator: &'a mut FillTessellator
+    pub fill_tessellator: &'a mut FillTessellator,
 }
 
 /// Construct a new **Drawing** instance.

diff --git a/src/draw/primitive/mod.rs b/src/draw/primitive/mod.rs
@@ -12,7 +12,7 @@ use crate::geom;
 pub use self::ellipse::Ellipse;
 pub use self::line::Line;
 pub use self::mesh::Mesh;
-pub use self::path::{Path, PathInit, PathFill, PathStroke};
+pub use self::path::{Path, PathFill, PathInit, PathStroke};
 pub use self::polygon::Polygon;
 pub use self::quad::Quad;
 pub use self::rect::Rect;

diff --git a/src/draw/primitive/path.rs b/src/draw/primitive/path.rs
@@ -297,11 +297,7 @@ impl PathStroke {
     }
 
     /// Submit path events as a polyline of colored points.
-    pub fn colored_points_closed<S, I>(
-        self,
-        ctxt: DrawingContext<S>,
-        points: I,
-    ) -> Path<S>
+    pub fn colored_points_closed<S, I>(self, ctxt: DrawingContext<S>, points: I) -> Path<S>
     where
         S: BaseFloat,
         I: IntoIterator,
@@ -322,10 +318,16 @@ where
         I: IntoIterator<Item = PathEvent>,
         for<'a> PathGeometryBuilder<'a, 'ctxt, S>: GeometryBuilder<T::VertexInput>,
     {
-        let DrawingContext { mesh, fill_tessellator } = ctxt;
+        let DrawingContext {
+            mesh,
+            fill_tessellator,
+        } = ctxt;
         let color = Cell::new(None);
         let stroke = &mut StrokeTessellator::default();
-        let tessellators = Tessellators { fill: fill_tessellator, stroke };
+        let tessellators = Tessellators {
+            fill: fill_tessellator,
+            stroke,
+        };
         let mut tessellator = T::tessellator(tessellators);
         let mut builder = mesh.builder();
         let res = self.opts.tessellate(
@@ -356,11 +358,7 @@ where
     /// Consumes an iterator of points and converts them to an iterator yielding path events.
     ///
     /// Closes the start and end points.
-    pub fn points_closed<'ctxt, S, I>(
-        self,
-        ctxt: DrawingContext<'ctxt, S>,
-        points: I,
-    ) -> Path<S>
+    pub fn points_closed<'ctxt, S, I>(self, ctxt: DrawingContext<'ctxt, S>, points: I) -> Path<S>
     where
         S: BaseFloat,
         I: IntoIterator,
@@ -383,15 +381,21 @@ where
         I::Item: Into<Point2<S>>,
         for<'a> PathGeometryBuilder<'a, 'ctxt, S>: GeometryBuilder<T::VertexInput>,
     {
-        let DrawingContext { mesh, fill_tessellator } = ctxt;
+        let DrawingContext {
+            mesh,
+            fill_tessellator,
+        } = ctxt;
         let color = Cell::new(None);
         let iter = points.into_iter().map(Into::into).map(|p| {
             let p: geom::Point2 = p.cast().expect("failed to cast point");
             lyon::math::point(p.x, p.y)
         });
         let events = lyon::path::iterator::FromPolyline::new(close, iter).path_events();
         let stroke = &mut StrokeTessellator::default();
-        let tessellators = Tessellators { fill: fill_tessellator, stroke };
+        let tessellators = Tessellators {
+            fill: fill_tessellator,
+            stroke,
+        };
         let mut tessellator = T::tessellator(tessellators);
         let mut builder = mesh.builder();
         let res = self.opts.tessellate(
@@ -421,7 +425,10 @@ where
         I::Item: Into<ColoredPoint2<S>>,
         for<'a> PathGeometryBuilder<'a, 'ctxt, S>: GeometryBuilder<T::VertexInput>,
     {
-        let DrawingContext { mesh, fill_tessellator } = ctxt;
+        let DrawingContext {
+            mesh,
+            fill_tessellator,
+        } = ctxt;
         let color = Cell::new(None);
         let iter = points.into_iter().map(Into::into).map(|p| {
             color.set(Some(p.color));
@@ -430,7 +437,10 @@ where
         });
         let events = lyon::path::iterator::FromPolyline::new(close, iter).path_events();
         let stroke = &mut StrokeTessellator::default();
-        let tessellators = Tessellators { fill: fill_tessellator, stroke };
+        let tessellators = Tessellators {
+            fill: fill_tessellator,
+            stroke,
+        };
         let mut tessellator = T::tessellator(tessellators);
         let mut builder = mesh.builder();
         let res = self.opts.tessellate(

diff --git a/src/geom/vector.rs b/src/geom/vector.rs
@@ -907,8 +907,8 @@ mod cgmath_impl {
 }
 
 mod lyon_impl {
-    use crate::math::Zero;
     use super::{Vector2, Vector3, Vector4};
+    use crate::math::Zero;
 
     impl<S> From<lyon::math::Point> for Vector2<S>
     where