diff --git a/src/angle.rs b/src/angle.rs index 8fde774..6232db4 100644 --- a/src/angle.rs +++ b/src/angle.rs @@ -2,8 +2,8 @@ use core::cmp::{Eq, Ord}; use funs::triganomic::{cos, sin}; use mat::{Mat3, Mat4}; -use num::kinds::{Float, Number}; use num::conv::cast; +use num::types::{Float, Number}; use quat::Quat; use vec::Vec3; diff --git a/src/color/channel.rs b/src/color/channel.rs index a7b5ab9..0c96614 100644 --- a/src/color/channel.rs +++ b/src/color/channel.rs @@ -1,4 +1,4 @@ -use num::kinds::Number; +use num::types::Number; /** * A color channel diff --git a/src/color/color.rs b/src/color/color.rs index c36db41..372d8ae 100644 --- a/src/color/color.rs +++ b/src/color/color.rs @@ -8,7 +8,7 @@ use angle::Degrees; use channel::Channel; use dim::{Dimensional, ToPtr}; use funs::common::Sign; -use num::kinds::{Float, Number}; +use num::types::{Float, Number}; /** * A generic color trait. diff --git a/src/funs/projection.rs b/src/funs/projection.rs index 84450c2..09223ac 100644 --- a/src/funs/projection.rs +++ b/src/funs/projection.rs @@ -1,6 +1,6 @@ use funs::triganomic::tan; use angle::Angle; -use num::kinds::{Float, Number}; +use num::types::{Float, Number}; use mat::Mat4; /** diff --git a/src/funs/triganomic.rs b/src/funs/triganomic.rs index c56ddae..af8e920 100644 --- a/src/funs/triganomic.rs +++ b/src/funs/triganomic.rs @@ -6,7 +6,7 @@ */ use angle::Radians; use num::conv::cast; -use num::kinds::Number; +use num::types::Number; use vec::{Vec3, Vec2, Vec4}; /** diff --git a/src/lmath.rc b/src/lmath.rc index da5c4f7..25fbd7c 100644 --- a/src/lmath.rc +++ b/src/lmath.rc @@ -66,6 +66,6 @@ pub mod funs { pub mod num { #[path = "num/conv.rs"] pub mod conv; - #[path = "num/kinds.rs"] - pub mod kinds; + #[path = "num/types.rs"] + pub mod types; } diff --git a/src/mat.rs b/src/mat.rs index f0d3757..c82dcec 100644 --- a/src/mat.rs +++ b/src/mat.rs @@ -12,7 +12,7 @@ use funs::common::*; use funs::exponential::*; use funs::triganomic::{sin, cos}; use num::conv::cast; -use num::kinds::{Float, Number}; +use num::types::{Float, Number}; use quat::{Quat, ToQuat}; use vec::{NumericVector, Vec2, Vec3, Vec4}; diff --git a/src/num/kinds.rs b/src/num/types.rs similarity index 100% rename from src/num/kinds.rs rename to src/num/types.rs diff --git a/src/quat.rs b/src/quat.rs index 0f806a4..842cbe4 100644 --- a/src/quat.rs +++ b/src/quat.rs @@ -21,7 +21,8 @@ use funs::common::*; use funs::exponential::*; use funs::triganomic::*; use mat::{Mat3, Mat4}; -use num::kinds::{Float, Number}; +use num::types::{Float, Number}; +use num::conv::cast; use vec::Vec3; diff --git a/src/vec.rs b/src/vec.rs index 80ae902..40f2eba 100644 --- a/src/vec.rs +++ b/src/vec.rs @@ -8,7 +8,7 @@ use std::cmp::FuzzyEq; use dim::{Dimensional, ToPtr}; use funs::exponential::Exp; -use num::kinds::Number; +use num::types::Number; /** * The base generic vector trait.