From 44ffc4fc26b53ea676816c144e37589e406da816 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Sun, 20 Feb 2022 12:20:29 +0100 Subject: [PATCH] Clean up imports I don't think they are used often enough to justify them. Qualifying them where they're used also makes the code more clear. --- src/kernel/geometry/curves/line.rs | 6 ++---- src/math/point.rs | 6 ++---- src/math/scalar.rs | 6 ++---- src/math/vector.rs | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/kernel/geometry/curves/line.rs b/src/kernel/geometry/curves/line.rs index 2aade32bb..58e1dd6d1 100644 --- a/src/kernel/geometry/curves/line.rs +++ b/src/kernel/geometry/curves/line.rs @@ -1,5 +1,3 @@ -use approx::AbsDiffEq; - use crate::math::{Point, Transform, Vector}; /// A line, defined by a point and a vector @@ -59,8 +57,8 @@ impl Line { } } -impl AbsDiffEq for Line { - type Epsilon = ::Epsilon; +impl approx::AbsDiffEq for Line { + type Epsilon = ::Epsilon; fn default_epsilon() -> Self::Epsilon { f64::default_epsilon() diff --git a/src/math/point.rs b/src/math/point.rs index eb1345dca..fd337e030 100644 --- a/src/math/point.rs +++ b/src/math/point.rs @@ -1,7 +1,5 @@ use std::ops; -use approx::AbsDiffEq; - use super::{Scalar, Vector}; /// An n-dimensional point @@ -165,8 +163,8 @@ impl ops::Mul for Point { } } -impl AbsDiffEq for Point { - type Epsilon = as AbsDiffEq>::Epsilon; +impl approx::AbsDiffEq for Point { + type Epsilon = as approx::AbsDiffEq>::Epsilon; fn default_epsilon() -> Self::Epsilon { f64::default_epsilon() diff --git a/src/math/scalar.rs b/src/math/scalar.rs index ed0644078..fae6d94d2 100644 --- a/src/math/scalar.rs +++ b/src/math/scalar.rs @@ -1,7 +1,5 @@ use std::{cmp, f64::consts::PI, hash::Hash, ops}; -use approx::AbsDiffEq; - /// A rational, finite scalar value /// /// This is a wrapper around `f64`. On construction, it checks that the `f64` @@ -272,8 +270,8 @@ impl num_traits::Signed for Scalar { } } -impl AbsDiffEq for Scalar { - type Epsilon = ::Epsilon; +impl approx::AbsDiffEq for Scalar { + type Epsilon = ::Epsilon; fn default_epsilon() -> Self::Epsilon { f64::default_epsilon() diff --git a/src/math/vector.rs b/src/math/vector.rs index cff6e30f6..bbf40f160 100644 --- a/src/math/vector.rs +++ b/src/math/vector.rs @@ -1,7 +1,5 @@ use std::ops; -use approx::AbsDiffEq; - use super::Scalar; /// An n-dimensional vector @@ -168,8 +166,8 @@ impl ops::Div for Vector { } } -impl AbsDiffEq for Vector { - type Epsilon = ::Epsilon; +impl approx::AbsDiffEq for Vector { + type Epsilon = ::Epsilon; fn default_epsilon() -> Self::Epsilon { f64::default_epsilon()