Remove comma separated inheritance lists

This commit is contained in:
Brendan Zabarauskas 2012-12-10 10:38:41 +10:00
parent 1a55784c81
commit b6049b28e2
6 changed files with 18 additions and 18 deletions

View file

@ -10,15 +10,15 @@ use vec::Vec3;
/** /**
* The base trait for anglular units * The base trait for anglular units
*/ */
pub trait Angle<T>: Add<self,self>, pub trait Angle<T>: Add<self,self>
Sub<self,self>, Sub<self,self>
Mul<T,self>, Mul<T,self>
Div<T,self>, Div<T,self>
// Div<self,T>, // TODO: not sure how to implement this, or if it is even possible... // Div<self,T> // TODO: not sure how to implement this, or if it is even possible...
Modulo<T,self>, Modulo<T,self>
// Modulo<self,T>, // TODO: not sure how to implement this, or if it is even possible... // Modulo<self,T> // TODO: not sure how to implement this, or if it is even possible...
Neg<self>, Neg<self>
Eq, Ord { Eq Ord {
static pure fn full_turn() -> self; static pure fn full_turn() -> self;
static pure fn half_turn() -> self; static pure fn half_turn() -> self;
static pure fn quadrant() -> self; static pure fn quadrant() -> self;

View file

@ -13,7 +13,7 @@ use num::kinds::{Float, Number};
/** /**
* A generic color trait. * A generic color trait.
*/ */
pub trait Color<T>: Dimensional<T>, ToPtr<T>, Eq { pub trait Color<T>: Dimensional<T> ToPtr<T> Eq {
/** /**
* # Return value * # Return value
* *

View file

@ -26,7 +26,7 @@ use vec::{NumericVector, Vec2, Vec3, Vec4};
* floating point type and have the same number of dimensions as the * floating point type and have the same number of dimensions as the
* number of rows and columns in the matrix. * number of rows and columns in the matrix.
*/ */
pub trait Matrix<T,V>: Dimensional<V>, ToPtr<T>, Eq, Neg<self> { pub trait Matrix<T,V>: Dimensional<V> ToPtr<T> Eq Neg<self> {
/** /**
* # Return value * # Return value
* *

View file

@ -4,7 +4,7 @@ use std::cmp::FuzzyEq;
use num::conv::NumConv; use num::conv::NumConv;
pub trait Number: Eq, Num, NumConv, Ord { pub trait Number: Eq Num NumConv Ord {
/** /**
* Construct a new number by casting a number the the static method's * Construct a new number by casting a number the the static method's
* enclosing type * enclosing type
@ -232,7 +232,7 @@ pub impl i64: Integer {}
pub impl int: Integer {} pub impl int: Integer {}
pub trait Float: Number, FuzzyEq { pub trait Float: Number FuzzyEq {
pure fn to_float() -> float; pure fn to_float() -> float;
static pure fn from_float(n: float) -> self; static pure fn from_float(n: float) -> self;

View file

@ -34,7 +34,7 @@ use vec::Vec3;
* * `V3` - The 3-dimensional vector type that will containin the imaginary * * `V3` - The 3-dimensional vector type that will containin the imaginary
* components of the quaternion. * components of the quaternion.
*/ */
pub trait Quaternion<T,V3>: Dimensional<T>, ToPtr<T>, Eq, Neg<self> { pub trait Quaternion<T,V3>: Dimensional<T> ToPtr<T> Eq Neg<self> {
static pure fn from_axis_angle<A:Angle<T>>(axis: &Vec3<T>, theta: A) -> self; static pure fn from_axis_angle<A:Angle<T>>(axis: &Vec3<T>, theta: A) -> self;
/** /**

View file

@ -18,7 +18,7 @@ use num::kinds::Number;
* * `T` - The type of the components. This is intended to support boolean, * * `T` - The type of the components. This is intended to support boolean,
* integer, unsigned integer, and floating point types. * integer, unsigned integer, and floating point types.
*/ */
pub trait Vector<T>: Dimensional<T>, ToPtr<T>, Eq { pub trait Vector<T>: Dimensional<T> ToPtr<T> Eq {
/** /**
* Construct the vector from a single value, copying it to each component * Construct the vector from a single value, copying it to each component
*/ */
@ -61,7 +61,7 @@ pub trait Vector4<T>: Vector<T> {
/** /**
* A vector with numeric components * A vector with numeric components
*/ */
pub trait NumericVector<T>: Vector<T>, Neg<self> { pub trait NumericVector<T>: Vector<T> Neg<self> {
/** /**
* The standard basis vector * The standard basis vector
* *
@ -119,7 +119,7 @@ pub trait NumericVector<T>: Vector<T>, Neg<self> {
/** /**
* A mutable vector with numeric components * A mutable vector with numeric components
*/ */
pub trait MutableNumericVector<T>: MutableVector<&self/T>, NumericVector<T> { pub trait MutableNumericVector<T>: MutableVector<&self/T> NumericVector<T> {
/** /**
* Negate the vector * Negate the vector
*/ */
@ -257,7 +257,7 @@ pub trait EuclideanVector<T>: NumericVector<T> {
* *
* * `T` - The type of the components. This should be a floating point type. * * `T` - The type of the components. This should be a floating point type.
*/ */
pub trait MutableEuclideanVector<T>: MutableNumericVector<&self/T>, pub trait MutableEuclideanVector<T>: MutableNumericVector<&self/T>
EuclideanVector<T> { EuclideanVector<T> {
/** /**
* Normalize the vector * Normalize the vector