Merge branch 'cargo_for_benchmarks' of git://github.com/aepsil0n/cgmath-rs

.travis.yml

@@ -20,7 +20,7 @@ env:
 script:
   - cargo build
   - cargo test
-  - make -C bench
+  - cargo bench
   - cargo doc
 after_script:
   # the doc directory needs to be in the root for rust-ci

bench/Makefile

@@ -1,11 +0,0 @@
-all: bench
-
-bench: *.rs ../src/*.rs
-	(cd .. && cargo build)
-	rustc -L ../target --test bench.rs
-
-run: bench
-	./bench --bench
-
-clean:
-	rm bench

bench/bench.rs

@@ -1,39 +0,0 @@
-// Copyright 2013 The CGMath Developers. For a full listing of the authors,
-// refer to the AUTHORS file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-#![feature(globs)]
-
-extern crate cgmath;
-extern crate test;
-
-// pub mod array;
-pub mod matrix;
-// pub mod quaternion;
-//pub mod vector;
-
-//pub mod angle;
-//pub mod plane;
-//pub mod point;
-// pub mod ray;
-// pub mod rotation;
-//pub mod transform;
-
-// pub mod projection;
-
-// pub mod aabb;
-// pub mod cylinder;
-// pub mod frustum;
-// pub mod intersect;
-// pub mod obb;
-//pub mod sphere;

benches/matrix.rs

@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![feature(globs)]
+
+extern crate cgmath;
+extern crate test;
+
 use cgmath::*;
 
 use test::Bencher;