Update to the last Rust.

Version of rustc: 0.10-pre (4243cad 2014-02-24 22:17:02 -0800)
sebcrozet · Feb 25, 2014 · 6a58314 · 6a58314
1 parent c1dc7cd
commit 6a58314
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -53,7 +53,7 @@ distcheck:
 	rm -rf $(tmp)
 
 deps:
-	cd $(glfw_path); cmake .; make lib
+	make lib -C $(glfw_path)
 	make -C lib/nalgebra
 	cd lib/gl-rs; rustc --opt-level=3 src/gl/lib.rs
 	cd lib/rust-stb-image; ./configure

diff --git a/lib/nalgebra b/lib/nalgebra
diff --git a/src/camera/arc_ball.rs b/src/camera/arc_ball.rs
@@ -14,7 +14,7 @@ use camera::Camera;
 /// direction
 /// * Scroll in/out - zoom in/out
 /// * Enter key - set the focus point to the origin
-#[deriving(Clone, ToStr)]
+#[deriving(Clone, Show)]
 pub struct ArcBall {
     /// The focus point.
     priv at:    Vec3<f32>,

diff --git a/src/camera/first_person.rs b/src/camera/first_person.rs
@@ -10,7 +10,7 @@ use camera::Camera;
 ///   * Right button press + drag - translates the camera position on the plane orthogonal to the
 ///   view direction
 ///   * Scroll in/out - zoom in/out
-#[deriving(ToStr, Clone)]
+#[deriving(Show, Clone)]
 pub struct FirstPerson {
     priv eye:             Vec3<f32>,
     priv yaw:             f32,

diff --git a/src/camera/first_person_stereo.rs b/src/camera/first_person_stereo.rs
@@ -15,7 +15,7 @@ mod error;
 ///   * Right button press + drag - translates the camera position on the plane orthogonal to the
 ///   view direction
 ///   * Scroll in/out - zoom in/out
-#[deriving(ToStr)]
+#[deriving(Show)]
 pub struct FirstPersonStereo {
     /// The camera position
     priv eye:        Vec3<f32>,