From 097d9df847347f7d2fc45381cc7b6cc52c4b8427 Mon Sep 17 00:00:00 2001 From: Jason Travis Smith Date: Sun, 20 Jan 2019 00:59:58 -0500 Subject: [PATCH] Fixed the library to use the new Rust 2018 module system. --- Cargo.toml | 1 + src/integer.rs | 6 +++--- src/matrix.rs | 9 +++++---- src/number.rs | 4 ++-- src/quaternion.rs | 13 +++++++------ src/real.rs | 8 ++++---- src/trig/degree.rs | 6 +++--- src/trig/radian.rs | 7 ++++--- src/trig/trig.rs | 4 ++-- src/vector.rs | 26 ++++++++++++++------------ 10 files changed, 45 insertions(+), 39 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 114f41f..2e4c9ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ license = "" repository = "https://gitlab.com/CyberMages/Core/sigils.git" documentation = "" keywords = ["sigils"] +edition = "2018" [dependencies.weave] diff --git a/src/integer.rs b/src/integer.rs index 49ba7e3..6ba0a85 100644 --- a/src/integer.rs +++ b/src/integer.rs @@ -1,6 +1,6 @@ -use ::number::Number; -use ::one::One; -use ::zero::Zero; +use crate::number::Number; +use crate::one::One; +use crate::zero::Zero; /// A trait that defines what is required to be considered diff --git a/src/matrix.rs b/src/matrix.rs index 3b74bb9..79e9eac 100644 --- a/src/matrix.rs +++ b/src/matrix.rs @@ -1,10 +1,11 @@ //! This module defines the 2x2, 3x3, and 4x4 Matrix structures. use std::ops::{Add, Sub, Mul, Div, Rem, Neg}; -use ::zero::Zero; -use ::one::One; -use ::number::Number; -use ::vector::{Vector, Vector2, Vector3, Vector4}; +use crate::zero::Zero; +use crate::one::One; +use crate::number::Number; +use crate::vector::{Vector, Vector2, Vector3, Vector4}; + /// A trait that defines the minimum set of diff --git a/src/number.rs b/src/number.rs index 962e9a7..08faf94 100644 --- a/src/number.rs +++ b/src/number.rs @@ -7,8 +7,8 @@ use std::str::FromStr; use weave::Bounded; -use ::zero::Zero; -use ::one::One; +use crate::zero::Zero; +use crate::one::One; /// A trait that defines what is required to be considered diff --git a/src/quaternion.rs b/src/quaternion.rs index 6c5c80e..0b20453 100644 --- a/src/quaternion.rs +++ b/src/quaternion.rs @@ -6,12 +6,13 @@ use std::fmt::{Error, Formatter, Debug, Display}; use std::ops::{Add, Sub, Mul, Div, Neg}; -use ::zero::Zero; -use ::one::One; -use ::real::Real; -use ::trig::Radian; -use ::trig::Trig; -use ::vector::{Vector, EuclideanVector, Vector3}; +use crate::zero::Zero; +use crate::one::One; +use crate::real::Real; +use crate::trig::Radian; +use crate::trig::Trig; +use crate::vector::{Vector, EuclideanVector, Vector3}; + /// A Quaternion is a combination of a scalar and a vector diff --git a/src/real.rs b/src/real.rs index aef5dc3..691f191 100644 --- a/src/real.rs +++ b/src/real.rs @@ -3,10 +3,10 @@ use std::ops::Neg; use binding::{CDouble, CFloat, CInt}; -use ::constants::Constants; -use ::number::Number; -use ::one::One; -use ::zero::Zero; +use crate::constants::Constants; +use crate::number::Number; +use crate::one::One; +use crate::zero::Zero; diff --git a/src/trig/degree.rs b/src/trig/degree.rs index be88b7a..4e6ee44 100644 --- a/src/trig/degree.rs +++ b/src/trig/degree.rs @@ -1,9 +1,9 @@ use std::ops::{Add, Sub, Mul, Div, Rem, Neg}; use std::ops::{AddAssign, SubAssign, MulAssign, DivAssign, RemAssign}; -use ::constants::Constants; -use ::real::Real; -use ::trig::radian::Radian; +use crate::constants::Constants; +use crate::real::Real; +use crate::trig::radian::Radian; diff --git a/src/trig/radian.rs b/src/trig/radian.rs index 956429b..5342163 100644 --- a/src/trig/radian.rs +++ b/src/trig/radian.rs @@ -1,9 +1,10 @@ use std::ops::{Add, Sub, Mul, Div, Rem, Neg}; use std::ops::{AddAssign, SubAssign, MulAssign, DivAssign, RemAssign}; -use ::constants::Constants; -use ::real::Real; -use ::trig::degree::Degree; +use crate::constants::Constants; +use crate::real::Real; +use crate::trig::degree::Degree; + /// A unit of angle, equal to an angle at the center of diff --git a/src/trig/trig.rs b/src/trig/trig.rs index 11c5654..5aad644 100644 --- a/src/trig/trig.rs +++ b/src/trig/trig.rs @@ -1,7 +1,7 @@ use binding::{CDouble, CFloat}; -use ::real::Real; -use ::trig::radian::Radian; +use crate::real::Real; +use crate::trig::radian::Radian; diff --git a/src/vector.rs b/src/vector.rs index f9f06ce..83cb757 100644 --- a/src/vector.rs +++ b/src/vector.rs @@ -5,12 +5,14 @@ use std::fmt::{Error, Formatter, Debug, Display}; use std::ops::{Add, Sub, Mul, Div, Rem, Neg}; use std::ops::{AddAssign, SubAssign, MulAssign, DivAssign, RemAssign}; -use ::zero::Zero; -use ::one::One; -use ::number::Number; -use ::real::Real; -use ::trig::Radian; -use ::trig::Trig; +use weave::attempt; + +use crate::zero::Zero; +use crate::one::One; +use crate::number::Number; +use crate::real::Real; +use crate::trig::Radian; +use crate::trig::Trig; @@ -548,12 +550,12 @@ macro_rules! define_vector // pretty up the printing. count = self.get_size(); - try!(write!(formatter, "<")); + attempt!(write!(formatter, "<")); $( - try!(write!(formatter, "{:?}", self.$field)); + attempt!(write!(formatter, "{:?}", self.$field)); if count > 0 { - try!(write!(formatter, ", ")); + attempt!(write!(formatter, ", ")); } count -= 1; )* @@ -573,12 +575,12 @@ macro_rules! define_vector // pretty up the printing. count = self.get_size(); - try!(write!(formatter, "<")); + attempt!(write!(formatter, "<")); $( - try!(write!(formatter, "{}", self.$field)); + attempt!(write!(formatter, "{}", self.$field)); if count > 1 { - try!(write!(formatter, ", ")); + attempt!(write!(formatter, ", ")); } count -= 1; )*