Remove unneeded extern crate and replace approx with cgmath

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ### v0.20
   - No actual API change, but updated to Rust2018 and synced with cgmath 0.17
-  - Uses latest versions of rand and approx for compatibility with other libraries
+  - Uses the latest versions of rand and approx for compatibility with other libraries
 
 ### v0.19
   - Updated version of num library to 0.2

Cargo.toml

@@ -33,7 +33,6 @@ name = "collision"
 
 [dependencies]
 rand = "0.8.4"
-approx = "0.4" # Only for the macros; for all other instances use the re-exported cgmath ones.
 cgmath = "0.18.0"
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 bit-set = "0.5.2"

README.md

@@ -41,7 +41,7 @@ at your option.
 
 ## Contributing
 
-Use [CONTRIBUTING.md](https://github.com/rustgd/collision-rs/blob/master/CONTRIBUTING.md) for futher information.
+Use [CONTRIBUTING.md](https://github.com/rustgd/collision-rs/blob/master/CONTRIBUTING.md) for further information.
 
 Pull requests are most welcome, especially in the realm of performance
 enhancements and fixing any mistakes. Unit tests and benchmarks are also 

benches/dbvt.rs

@@ -1,8 +1,5 @@
 #![feature(test)]
 
-extern crate cgmath;
-extern crate collision;
-extern crate rand;
 extern crate test;
 
 use cgmath::prelude::*;

benches/polyhedron.rs

@@ -1,9 +1,5 @@
 #![feature(test)]
 
-extern crate cgmath;
-extern crate collision;
-extern crate genmesh;
-extern crate rand;
 extern crate test;
 
 use cgmath::prelude::*;

src/algorithm/minkowski/epa/epa2d.rs

@@ -1,6 +1,6 @@
 use std::marker;
 
-use approx::assert_ulps_ne;
+use cgmath::assert_ulps_ne;
 use cgmath::num_traits::NumCast;
 use cgmath::prelude::*;
 use cgmath::{BaseFloat, Point2, Vector2};
@@ -157,7 +157,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Basis2, Decomposed, Point2, Rad, Rotation2, Vector2};
 
     use super::*;

src/algorithm/minkowski/epa/epa3d.rs

@@ -220,7 +220,7 @@ fn remove_or_add_edge(edges: &mut Vec<(usize, usize)>, edge: (usize, usize)) {
 
 #[cfg(test)]
 mod tests {
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Decomposed, Quaternion, Rad, Vector3};
 
     use super::*;

src/algorithm/minkowski/gjk/mod.rs

@@ -15,7 +15,7 @@ use self::simplex::{Simplex, SimplexProcessor2, SimplexProcessor3};
 use crate::algorithm::minkowski::{SupportPoint, EPA, EPA2, EPA3};
 use crate::prelude::*;
 use crate::{CollisionStrategy, Contact};
-use approx::ulps_eq;
+use cgmath::ulps_eq;
 
 mod simplex;
 
@@ -590,7 +590,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{
         Basis2, Decomposed, Point2, Point3, Quaternion, Rad, Rotation2, Rotation3, Vector2, Vector3,
     };

src/algorithm/minkowski/gjk/simplex/simplex2d.rs

@@ -1,8 +1,8 @@
 use std::marker;
 use std::ops::Neg;
 
-use approx::ulps_eq;
 use cgmath::prelude::*;
+use cgmath::ulps_eq;
 use cgmath::{BaseFloat, Point2, Vector2};
 
 use super::{Simplex, SimplexProcessor};
@@ -101,7 +101,7 @@ mod tests {
 
     use super::*;
     use crate::algorithm::minkowski::SupportPoint;
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use smallvec::smallvec;
 
     #[test]

src/algorithm/minkowski/gjk/simplex/simplex3d.rs

@@ -1,9 +1,9 @@
 use std::marker;
 use std::ops::Neg;
 
-use approx::ulps_eq;
 use cgmath::num_traits::cast;
 use cgmath::prelude::*;
+use cgmath::ulps_eq;
 use cgmath::{BaseFloat, Point3, Vector3};
 
 use super::{Simplex, SimplexProcessor};
@@ -223,7 +223,7 @@ fn check_side<S>(
 mod tests {
     use std::ops::Neg;
 
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Point3, Vector3};
     use smallvec::smallvec;
 

src/plane.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
-use approx::{ulps_eq, ulps_ne};
 use cgmath::prelude::*;
+use cgmath::{ulps_eq, ulps_ne};
 use cgmath::{AbsDiffEq, RelativeEq, UlpsEq};
 use cgmath::{BaseFloat, Point3, Vector3, Vector4};
 

src/primitive/capsule.rs

@@ -201,7 +201,7 @@ where
 mod tests {
     use std;
 
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Decomposed, Quaternion, Rad, Vector3};
 
     use super::*;

src/primitive/circle.rs

@@ -93,7 +93,7 @@ mod tests {
 
     use crate::prelude::*;
     use crate::Ray2;
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Basis2, Decomposed, Point2, Rad, Rotation2, Vector2};
 
     use super::*;

src/primitive/cuboid.rs

@@ -214,7 +214,7 @@ where
 #[cfg(test)]
 mod tests {
 
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Decomposed, Point3, Quaternion, Rad, Vector3};
 
     use super::*;

src/primitive/cylinder.rs

@@ -231,7 +231,7 @@ where
 mod tests {
     use std;
 
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Decomposed, Quaternion, Rad, Vector3};
 
     use super::*;

src/primitive/particle.rs

@@ -161,7 +161,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::prelude::*;
     use cgmath::{Basis2, Decomposed, Point2, Rad, Vector2};
 

src/primitive/polygon.rs

@@ -196,7 +196,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Basis2, Decomposed, Point2, Rad, Vector2};
 
     use super::*;

src/primitive/polyhedron.rs

@@ -576,7 +576,7 @@ where
 #[cfg(test)]
 mod tests {
 
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::prelude::*;
     use cgmath::{Decomposed, Point3, Quaternion, Rad, Vector3};
 

src/primitive/rectangle.rs

@@ -184,7 +184,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Basis2, Decomposed, Point2, Rad, Vector2};
 
     use super::*;

src/primitive/sphere.rs

@@ -101,7 +101,7 @@ where
 mod tests {
     use std;
 
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Decomposed, Point3, Quaternion, Rad, Rotation3, Vector3};
 
     use super::*;

src/primitive/util.rs

@@ -138,7 +138,7 @@ where
 mod tests {
     use std;
 
-    use approx::assert_ulps_eq;
+    use cgmath::assert_ulps_eq;
     use cgmath::{Basis2, Decomposed, Point2, Rad, Rotation2, Vector2};
 
     use super::*;

tests/aabb.rs

@@ -1,6 +1,3 @@
-extern crate cgmath;
-extern crate collision;
-
 use cgmath::InnerSpace;
 use cgmath::{Point2, Point3};
 use cgmath::{Vector2, Vector3};

tests/bound.rs

@@ -1,5 +1,3 @@
-extern crate collision;
-
 use collision::PlaneBound;
 
 fn _box(_: Box<dyn PlaneBound<f32>>) {}

tests/dbvt.rs

@@ -1,7 +1,3 @@
-extern crate cgmath;
-extern crate collision;
-extern crate rand;
-
 use cgmath::prelude::*;
 use cgmath::{Deg, PerspectiveFov, Point2, Point3, Vector2, Vector3};
 use collision::dbvt::*;

tests/frustum.rs

@@ -1,6 +1,3 @@
-extern crate cgmath;
-extern crate collision;
-
 use cgmath::{PerspectiveFov, Point3, Rad};
 use collision::{Projection, Relation, Sphere};
 

tests/plane.rs

@@ -1,8 +1,3 @@
-extern crate approx;
-
-extern crate cgmath;
-extern crate collision;
-
 use cgmath::*;
 use collision::*;
 

tests/point.rs

@@ -1,9 +1,4 @@
-#[macro_use]
-extern crate approx;
-
-extern crate cgmath;
-extern crate collision;
-
+use cgmath::assert_ulps_eq;
 use cgmath::{Point3, Vector3};
 use collision::{Continuous, Plane, PlaneBound, Ray3, Relation};
 

tests/serde.rs

@@ -1,8 +1,5 @@
 #![cfg(feature = "serde")]
 
-extern crate cgmath;
-extern crate serde;
-
 use cgmath::Point1;
 use serde::Serialize;
 

tests/sphere.rs

@@ -1,8 +1,3 @@
-extern crate approx;
-
-extern crate cgmath;
-extern crate collision;
-
 use cgmath::*;
 use collision::*;