Merge pull request #69 from bfops/master

rustup

benches/common/macros.rs

@@ -1,4 +1,4 @@
-#![macro_escape]
+#![macro_use]
 
 macro_rules! bench_binop(
     ($name: ident, $t1: ty, $t2: ty, $binop: ident) => {

benches/construction.rs

@@ -1,5 +1,3 @@
-#![feature(macro_rules)]
-
 extern crate test;
 extern crate "nalgebra" as na;
 

benches/dmat.rs

@@ -1,5 +1,3 @@
-#![feature(macro_rules)]
-
 extern crate test;
 extern crate "nalgebra" as na;
 

src/lib.rs

@@ -82,10 +82,6 @@ Feel free to add your project to this list if you happen to use **nalgebra**!
 #![deny(unused_qualifications)]
 #![deny(unused_results)]
 #![warn(missing_docs)]
-#![feature(macro_rules)]
-#![feature(globs)]
-#![feature(default_type_params)]
-#![feature(associated_types)]
 #![feature(old_orphan_check)]
 #![feature(unboxed_closures)]
 #![doc(html_root_url = "http://nalgebra.org/doc")]

src/structs/dvec_macros.rs

@@ -1,4 +1,4 @@
-#![macro_escape]
+#![macro_use]
 
 macro_rules! dvec_impl(
     ($dvec: ident) => (

src/structs/iso_macros.rs

@@ -1,4 +1,4 @@
-#![macro_escape]
+#![macro_use]
 
 macro_rules! iso_impl(
     ($t: ident, $submat: ident, $subvec: ident, $subrotvec: ident) => (

src/structs/mat_macros.rs

@@ -1,4 +1,4 @@
-#![macro_escape]
+#![macro_use]
 
 macro_rules! mat_impl(
   ($t: ident, $comp0: ident $(,$compN: ident)*) => (

src/structs/pnt_macros.rs

@@ -1,4 +1,4 @@
-#![macro_escape]
+#![macro_use]
 
 macro_rules! orig_impl(
     ($t: ident, $comp0: ident $(,$compN: ident)*) => (

src/structs/rot_macros.rs

@@ -1,4 +1,4 @@
-#![macro_escape]
+#![macro_use]
 
 macro_rules! submat_impl(
     ($t: ident, $submat: ident) => (

src/structs/vec_macros.rs

@@ -1,4 +1,4 @@
-#![macro_escape]
+#![macro_use]
 
 macro_rules! new_impl(
     ($t: ident, $comp0: ident $(,$compN: ident)*) => (

src/traits/structure.rs

@@ -2,7 +2,7 @@
 
 use std::f32;
 use std::f64;
-use std::num::{Int, Float, FloatMath};
+use std::num::{Int, Float};
 use std::slice::{Iter, IterMut};
 use std::ops::{Add, Sub, Mul, Div, Neg, Rem, Index, IndexMut};
 use traits::operations::{RMul, LMul, Axpy, Transpose, Inv, Absolute};
@@ -17,7 +17,7 @@ pub trait BaseNum: Copy + Zero + One +
 }
 
 /// Basic floating-point number numeric trait.
-pub trait BaseFloat: FloatMath + BaseNum {
+pub trait BaseFloat: Float + BaseNum {
     /// Archimedes' constant.
     fn pi() -> Self;
     /// 2.0 * pi.

tests/assert.rs

@@ -1,9 +1,9 @@
 //! Assertion macro tests
 
-#![feature(phase)]
+#![feature(plugin)]
 
-#[phase(plugin)]
-extern crate nalgebra;
+#[plugin]
+#[macro_use]
 extern crate nalgebra;
 
 use nalgebra::{ApproxEq, Vec2};

tests/mat.rs

@@ -1,5 +1,3 @@
-#![feature(macro_rules)]
-
 extern crate "nalgebra" as na;
 
 use std::rand::random;

tests/quat.rs

@@ -1,5 +1,3 @@
-#![feature(macro_rules)]
-
 extern crate "nalgebra" as na;
 
 use na::{Pnt3, Vec3, Rot3, UnitQuat, Rotation};

tests/vec.rs

@@ -1,5 +1,3 @@
-#![feature(macro_rules)]
-
 extern crate "nalgebra" as na;
 
 use std::rand::random;