From 94ef916f4925d24cdde0fcf7fb99ee47a83e3a3d Mon Sep 17 00:00:00 2001 From: Yuri Edward Date: Tue, 19 Oct 2021 16:18:25 +0200 Subject: [PATCH] Fixed cargo fmt --- src/geometry/scale.rs | 3 ++- src/geometry/scale_construction.rs | 2 +- src/geometry/scale_conversion.rs | 22 +++++++--------------- src/geometry/scale_ops.rs | 2 +- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/geometry/scale.rs b/src/geometry/scale.rs index 67210720..5c55e5f4 100755 --- a/src/geometry/scale.rs +++ b/src/geometry/scale.rs @@ -210,7 +210,8 @@ impl Scale { where T: Zero + One + Clone, Const: DimNameAdd, - DefaultAllocator: Allocator, U1>, DimNameSum, U1>> + Allocator, U1>, U1>, + DefaultAllocator: Allocator, U1>, DimNameSum, U1>> + + Allocator, U1>, U1>, { // Unfortunately rust refuses at all costs to allow calling .to_homogeneous on a SVector // (self.vector) so I had to do a manual copy in a new OVector diff --git a/src/geometry/scale_construction.rs b/src/geometry/scale_construction.rs index cade72c2..02cce69c 100644 --- a/src/geometry/scale_construction.rs +++ b/src/geometry/scale_construction.rs @@ -3,7 +3,7 @@ use crate::base::storage::Owned; #[cfg(feature = "arbitrary")] use quickcheck::{Arbitrary, Gen}; -use num::{One}; +use num::One; #[cfg(feature = "rand-no-std")] use rand::{ distributions::{Distribution, Standard}, diff --git a/src/geometry/scale_conversion.rs b/src/geometry/scale_conversion.rs index 4b627e5c..1dbf3033 100644 --- a/src/geometry/scale_conversion.rs +++ b/src/geometry/scale_conversion.rs @@ -7,9 +7,7 @@ use crate::base::allocator::Allocator; use crate::base::dimension::{DimNameAdd, DimNameSum, U1}; use crate::base::{Const, DefaultAllocator, DimName, OMatrix, OVector, SVector, Scalar}; -use crate::geometry::{ - SuperTCategoryOf, TAffine, Transform, Scale -}; +use crate::geometry::{Scale, SuperTCategoryOf, TAffine, Transform}; use crate::Point; /* @@ -50,8 +48,7 @@ where T2: RealField + SupersetOf, C: SuperTCategoryOf, Const: DimNameAdd, - DefaultAllocator: - Allocator, U1>, DimNameSum, U1>> + DefaultAllocator: Allocator, U1>, DimNameSum, U1>> + Allocator, U1>, U1> + Allocator, U1>, DimNameSum, U1>>, { @@ -77,8 +74,7 @@ where T1: RealField, T2: RealField + SupersetOf, Const: DimNameAdd, - DefaultAllocator: - Allocator, U1>, DimNameSum, U1>> + DefaultAllocator: Allocator, U1>, DimNameSum, U1>> + Allocator, U1>, U1> + Allocator, U1>, DimNameSum, U1>>, // + Allocator @@ -116,8 +112,7 @@ impl From> for OMatrix, U1>, DimNameSum, U1>> where Const: DimNameAdd, - DefaultAllocator: - Allocator, U1>, DimNameSum, U1>> + DefaultAllocator: Allocator, U1>, DimNameSum, U1>> + Allocator, U1>, U1> + Allocator>, { @@ -157,8 +152,7 @@ impl From> for [T; D] { } } -impl From<[Scale; 2]> - for Scale +impl From<[Scale; 2]> for Scale where T: From<[::Element; 2]>, T::Element: Scalar, @@ -172,8 +166,7 @@ where } } -impl From<[Scale; 4]> - for Scale +impl From<[Scale; 4]> for Scale where T: From<[::Element; 4]>, T::Element: Scalar, @@ -189,8 +182,7 @@ where } } -impl From<[Scale; 8]> - for Scale +impl From<[Scale; 8]> for Scale where T: From<[::Element; 8]>, T::Element: Scalar, diff --git a/src/geometry/scale_ops.rs b/src/geometry/scale_ops.rs index 80927557..4d8b5f41 100644 --- a/src/geometry/scale_ops.rs +++ b/src/geometry/scale_ops.rs @@ -1,6 +1,6 @@ use std::ops::{Mul, MulAssign}; -use simba::scalar::{ClosedMul}; +use simba::scalar::ClosedMul; use crate::base::constraint::{SameNumberOfColumns, SameNumberOfRows, ShapeConstraint}; use crate::base::dimension::U1;