From bd7b4f287f6a5fb0023e15bcec9a5e3f8cb091cc Mon Sep 17 00:00:00 2001 From: Ben Foppa Date: Wed, 7 Jan 2015 15:11:09 -0500 Subject: [PATCH] rustup --- benches/common/macros.rs | 2 +- benches/construction.rs | 2 -- benches/dmat.rs | 2 -- src/lib.rs | 4 ---- src/structs/dvec_macros.rs | 2 +- src/structs/iso_macros.rs | 2 +- src/structs/mat_macros.rs | 2 +- src/structs/pnt_macros.rs | 2 +- src/structs/rot_macros.rs | 2 +- src/structs/vec_macros.rs | 2 +- src/traits/structure.rs | 4 ++-- tests/assert.rs | 6 +++--- tests/mat.rs | 2 -- tests/quat.rs | 2 -- tests/vec.rs | 2 -- 15 files changed, 12 insertions(+), 26 deletions(-) diff --git a/benches/common/macros.rs b/benches/common/macros.rs index b6e693d7..2918f428 100644 --- a/benches/common/macros.rs +++ b/benches/common/macros.rs @@ -1,4 +1,4 @@ -#![macro_escape] +#![macro_use] macro_rules! bench_binop( ($name: ident, $t1: ty, $t2: ty, $binop: ident) => { diff --git a/benches/construction.rs b/benches/construction.rs index 9782d718..d8e33a8b 100644 --- a/benches/construction.rs +++ b/benches/construction.rs @@ -1,5 +1,3 @@ -#![feature(macro_rules)] - extern crate test; extern crate "nalgebra" as na; diff --git a/benches/dmat.rs b/benches/dmat.rs index 4a5ee500..bd1468f8 100644 --- a/benches/dmat.rs +++ b/benches/dmat.rs @@ -1,5 +1,3 @@ -#![feature(macro_rules)] - extern crate test; extern crate "nalgebra" as na; diff --git a/src/lib.rs b/src/lib.rs index e24ca3a5..1508b659 100644 --- a/src/lib.rs +++ b/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")] diff --git a/src/structs/dvec_macros.rs b/src/structs/dvec_macros.rs index 5cdef332..be151fd4 100644 --- a/src/structs/dvec_macros.rs +++ b/src/structs/dvec_macros.rs @@ -1,4 +1,4 @@ -#![macro_escape] +#![macro_use] macro_rules! dvec_impl( ($dvec: ident) => ( diff --git a/src/structs/iso_macros.rs b/src/structs/iso_macros.rs index b68343b9..89b64eb5 100644 --- a/src/structs/iso_macros.rs +++ b/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) => ( diff --git a/src/structs/mat_macros.rs b/src/structs/mat_macros.rs index 71e77c5d..9760a354 100644 --- a/src/structs/mat_macros.rs +++ b/src/structs/mat_macros.rs @@ -1,4 +1,4 @@ -#![macro_escape] +#![macro_use] macro_rules! mat_impl( ($t: ident, $comp0: ident $(,$compN: ident)*) => ( diff --git a/src/structs/pnt_macros.rs b/src/structs/pnt_macros.rs index b09f8fa9..34b4c627 100644 --- a/src/structs/pnt_macros.rs +++ b/src/structs/pnt_macros.rs @@ -1,4 +1,4 @@ -#![macro_escape] +#![macro_use] macro_rules! orig_impl( ($t: ident, $comp0: ident $(,$compN: ident)*) => ( diff --git a/src/structs/rot_macros.rs b/src/structs/rot_macros.rs index 975b4882..c49c8ac2 100644 --- a/src/structs/rot_macros.rs +++ b/src/structs/rot_macros.rs @@ -1,4 +1,4 @@ -#![macro_escape] +#![macro_use] macro_rules! submat_impl( ($t: ident, $submat: ident) => ( diff --git a/src/structs/vec_macros.rs b/src/structs/vec_macros.rs index aa2573f6..44854661 100644 --- a/src/structs/vec_macros.rs +++ b/src/structs/vec_macros.rs @@ -1,4 +1,4 @@ -#![macro_escape] +#![macro_use] macro_rules! new_impl( ($t: ident, $comp0: ident $(,$compN: ident)*) => ( diff --git a/src/traits/structure.rs b/src/traits/structure.rs index 5ffa712d..cc25dcc8 100644 --- a/src/traits/structure.rs +++ b/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. diff --git a/tests/assert.rs b/tests/assert.rs index 9348a0f1..0b0ebcee 100644 --- a/tests/assert.rs +++ b/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}; diff --git a/tests/mat.rs b/tests/mat.rs index b37c5ea5..edaf1f05 100644 --- a/tests/mat.rs +++ b/tests/mat.rs @@ -1,5 +1,3 @@ -#![feature(macro_rules)] - extern crate "nalgebra" as na; use std::rand::random; diff --git a/tests/quat.rs b/tests/quat.rs index 5c7afbfd..1c967ff0 100644 --- a/tests/quat.rs +++ b/tests/quat.rs @@ -1,5 +1,3 @@ -#![feature(macro_rules)] - extern crate "nalgebra" as na; use na::{Pnt3, Vec3, Rot3, UnitQuat, Rotation}; diff --git a/tests/vec.rs b/tests/vec.rs index 45f3a3e4..8af66537 100644 --- a/tests/vec.rs +++ b/tests/vec.rs @@ -1,5 +1,3 @@ -#![feature(macro_rules)] - extern crate "nalgebra" as na; use std::rand::random;