From 337061bd82f3881d952ebd54b65f5c475b0581cb Mon Sep 17 00:00:00 2001
From: Brendan Zabarauskas <bjzaba@yahoo.com.au>
Date: Sun, 26 Jan 2014 04:55:18 +1100
Subject: [PATCH 1/2] Call rustc directly in .travis.yml

---
 .travis.sh                       | 1 -
 .travis.yml                      | 9 ++++++---
 src/{tests => test}/angle.rs     | 0
 src/{tests => test}/matrix.rs    | 0
 src/{tests => test}/plane.rs     | 0
 src/{tests => test}/point.rs     | 0
 src/{tests => test}/sphere.rs    | 0
 src/{tests => test}/test.rs      | 0
 src/{tests => test}/transform.rs | 0
 src/{tests => test}/vector.rs    | 0
 10 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 .travis.sh
 rename src/{tests => test}/angle.rs (100%)
 rename src/{tests => test}/matrix.rs (100%)
 rename src/{tests => test}/plane.rs (100%)
 rename src/{tests => test}/point.rs (100%)
 rename src/{tests => test}/sphere.rs (100%)
 rename src/{tests => test}/test.rs (100%)
 rename src/{tests => test}/transform.rs (100%)
 rename src/{tests => test}/vector.rs (100%)

diff --git a/.travis.sh b/.travis.sh
deleted file mode 100644
index 7ea18fb..0000000
--- a/.travis.sh
+++ /dev/null
@@ -1 +0,0 @@
-`find build -name benchbench` --bench
diff --git a/.travis.yml b/.travis.yml
index d4cd45d..b0da575 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ before_install:
 install:
   - sudo apt-get install rust-nightly
 script:
-  - rustpkg test tests
-  - rustpkg build --opt-level=3 bench
-  -  sh .travis.sh
+  - mkdir -p lib bin
+  - rustc --out-dir lib ./src/cgmath/lib.rs
+  - rustc --out-dir bin --test -L ./lib ./src/test/test.rs
+  - rustc --out-dir bin --test -L ./lib ./src/bench/bench.rs
+  - ./bin/test
+#  - ./bin/bench --bench
diff --git a/src/tests/angle.rs b/src/test/angle.rs
similarity index 100%
rename from src/tests/angle.rs
rename to src/test/angle.rs
diff --git a/src/tests/matrix.rs b/src/test/matrix.rs
similarity index 100%
rename from src/tests/matrix.rs
rename to src/test/matrix.rs
diff --git a/src/tests/plane.rs b/src/test/plane.rs
similarity index 100%
rename from src/tests/plane.rs
rename to src/test/plane.rs
diff --git a/src/tests/point.rs b/src/test/point.rs
similarity index 100%
rename from src/tests/point.rs
rename to src/test/point.rs
diff --git a/src/tests/sphere.rs b/src/test/sphere.rs
similarity index 100%
rename from src/tests/sphere.rs
rename to src/test/sphere.rs
diff --git a/src/tests/test.rs b/src/test/test.rs
similarity index 100%
rename from src/tests/test.rs
rename to src/test/test.rs
diff --git a/src/tests/transform.rs b/src/test/transform.rs
similarity index 100%
rename from src/tests/transform.rs
rename to src/test/transform.rs
diff --git a/src/tests/vector.rs b/src/test/vector.rs
similarity index 100%
rename from src/tests/vector.rs
rename to src/test/vector.rs

From 6b33f5d7e5386c98a42fa962bebae0ef20f156fa Mon Sep 17 00:00:00 2001
From: Brendan Zabarauskas <bjzaba@yahoo.com.au>
Date: Sun, 26 Jan 2014 04:59:13 +1100
Subject: [PATCH 2/2] Remove unnecessary parentheses

---
 src/cgmath/sphere.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cgmath/sphere.rs b/src/cgmath/sphere.rs
index b2f6643..53808e4 100644
--- a/src/cgmath/sphere.rs
+++ b/src/cgmath/sphere.rs
@@ -41,7 +41,7 @@ impl<S: Float> Intersect<Option<Point3<S>>> for (Sphere<S>, Ray3<S>) {
                 let tca = l.dot(&r.direction);
                 if tca < cast(0.0) { return None; }
                 let d2 = l.dot(&l) - tca*tca;
-                if (d2 > s.radius*s.radius) { return None; }
+                if d2 > s.radius*s.radius { return None; }
                 let thc = num::sqrt(s.radius*s.radius - d2);
                 Some(r.origin.add_v(&r.direction.mul_s(tca - thc)))
             }