From 5d8319fff01ea4a66465397de1f27096b341c022 Mon Sep 17 00:00:00 2001
From: Brendan Zabarauskas <bjzaba@yahoo.com.au>
Date: Mon, 29 Oct 2012 21:53:25 +1000
Subject: [PATCH] Fix collision of omath::vec and core::vec

---
 src/{mat.rs => matrix.rs}                     |  4 ++--
 src/omath.rc                                  | 12 ++++++------
 src/projection.rs                             |  2 +-
 src/{quat.rs => quaternion.rs}                |  6 +++---
 src/test/{test_mat.rs => test_matrix.rs}      |  4 ++--
 src/test/{test_quat.rs => test_quaternion.rs} |  6 +++---
 src/test/{test_vec.rs => test_vector.rs}      |  2 +-
 src/{vec.rs => vector.rs}                     |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)
 rename src/{mat.rs => matrix.rs} (99%)
 rename src/{quat.rs => quaternion.rs} (97%)
 rename src/test/{test_mat.rs => test_matrix.rs} (99%)
 rename src/test/{test_quat.rs => test_quaternion.rs} (91%)
 rename src/test/{test_vec.rs => test_vector.rs} (99%)
 rename src/{vec.rs => vector.rs} (99%)

diff --git a/src/mat.rs b/src/matrix.rs
similarity index 99%
rename from src/mat.rs
rename to src/matrix.rs
index 6a34a2e..bcbcc67 100644
--- a/src/mat.rs
+++ b/src/matrix.rs
@@ -1,8 +1,8 @@
 use std::cmp::FuzzyEq;
 use cmp::Eq;
 use math::Sqrt;
-use quat::Quat;
-use vec::*;
+use quaternion::Quat;
+use vector::*;
 
 //
 //  NxN Matrix
diff --git a/src/omath.rc b/src/omath.rc
index ffbb0ad..d077675 100644
--- a/src/omath.rc
+++ b/src/omath.rc
@@ -7,17 +7,17 @@
 
 extern mod std;
 
-pub mod mat;
+pub mod matrix;
 pub mod math;
 pub mod projection;
-pub mod quat;
-pub mod vec;
+pub mod quaternion;
+pub mod vector;
 
 #[test]
 pub mod test {
-    pub mod test_mat;
+    pub mod test_matrix;
     pub mod test_math;
     pub mod test_projection;
-    pub mod test_quat;
-    pub mod test_vec;
+    pub mod test_quaternion;
+    pub mod test_vector;
 }
\ No newline at end of file
diff --git a/src/projection.rs b/src/projection.rs
index 026a8c9..9a17a55 100644
--- a/src/projection.rs
+++ b/src/projection.rs
@@ -1,6 +1,6 @@
 use float::consts::pi;
 use float::tan;
-use mat::Mat4;
+use matrix::Mat4;
 
 //
 //  Create a perspective projection matrix
diff --git a/src/quat.rs b/src/quaternion.rs
similarity index 97%
rename from src/quat.rs
rename to src/quaternion.rs
index cba4756..f530c62 100644
--- a/src/quat.rs
+++ b/src/quaternion.rs
@@ -1,11 +1,11 @@
 use cast::transmute;
-use core::vec::raw::buf_as_slice; // for some reason we need to specify the core module here
+use vec::raw::buf_as_slice;
 use ptr::to_unsafe_ptr;
 use cmp::Eq;
 use std::cmp::FuzzyEq;
 use math::*;
-use mat::{Mat3, Mat4};
-use vec::Vec3;
+use matrix::{Mat3, Mat4};
+use vector::Vec3;
 
 //
 //  Quaternion
diff --git a/src/test/test_mat.rs b/src/test/test_matrix.rs
similarity index 99%
rename from src/test/test_mat.rs
rename to src/test/test_matrix.rs
index d406bc9..ba0048e 100644
--- a/src/test/test_mat.rs
+++ b/src/test/test_matrix.rs
@@ -1,5 +1,5 @@
-use mat::*;
-use vec::*;
+use matrix::*;
+use vector::*;
 
 // TODO
 
diff --git a/src/test/test_quat.rs b/src/test/test_quaternion.rs
similarity index 91%
rename from src/test/test_quat.rs
rename to src/test/test_quaternion.rs
index 8db6a8b..a29659d 100644
--- a/src/test/test_quat.rs
+++ b/src/test/test_quaternion.rs
@@ -1,6 +1,6 @@
-use mat::*;
-use quat::*;
-use vec::*;
+use matrix::*;
+use quaternion::*;
+use vector::*;
 
 // TODO
 
diff --git a/src/test/test_vec.rs b/src/test/test_vector.rs
similarity index 99%
rename from src/test/test_vec.rs
rename to src/test/test_vector.rs
index 210036c..305cf2c 100644
--- a/src/test/test_vec.rs
+++ b/src/test/test_vector.rs
@@ -1,5 +1,5 @@
 use std::cmp::FuzzyEq;
-use vec::*;
+use vector::*;
 
 // TODO
 
diff --git a/src/vec.rs b/src/vector.rs
similarity index 99%
rename from src/vec.rs
rename to src/vector.rs
index 040d532..2f56951 100644
--- a/src/vec.rs
+++ b/src/vector.rs
@@ -1,5 +1,5 @@
 use cast::transmute;
-use core::vec::raw::buf_as_slice; // for some reason we need to specify the core module here
+use vec::raw::buf_as_slice;
 use ptr::to_unsafe_ptr;
 use cmp::Eq;
 use std::cmp::FuzzyEq;