Fixed the library to use the new Rust 2018 module system.

This commit is contained in:
Myrddin Dundragon 2019-01-20 00:59:58 -05:00
parent 46f1bcafca
commit 097d9df847
10 changed files with 45 additions and 39 deletions

View File

@ -7,6 +7,7 @@ license = ""
repository = "https://gitlab.com/CyberMages/Core/sigils.git"
documentation = ""
keywords = ["sigils"]
edition = "2018"
[dependencies.weave]

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -1,7 +1,7 @@
use binding::{CDouble, CFloat};
use ::real::Real;
use ::trig::radian::Radian;
use crate::real::Real;
use crate::trig::radian::Radian;

View File

@ -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;
)*