From aedc9982d59646b7eaac413f0c59b2e0e5f3d4b5 Mon Sep 17 00:00:00 2001
From: Hanno Braun <mail@hannobraun.de>
Date: Fri, 9 May 2014 10:04:43 +0000
Subject: [PATCH] Upgrade Rust

Please note that this includes two pending pull requests in Rust and
glfw-rs:
- https://github.com/mozilla/rust/pull/14040
- https://github.com/bjz/glfw-rs/pull/151
---
 scripts/tools/compile-rust | 2 +-
 vendor/glfw-rs             | 2 +-
 vendor/rust                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/tools/compile-rust b/scripts/tools/compile-rust
index cd91a15c..3b6fac94 100755
--- a/scripts/tools/compile-rust
+++ b/scripts/tools/compile-rust
@@ -11,4 +11,4 @@ LIB_ARGS=$2
 OUTPUT_ARGS=$3
 SOURCE_FILE=$4
 
-$RUSTC --force-color-output --debuginfo 2 $LIB_ARGS $OUTPUT_ARGS $SOURCE_FILE
+$RUSTC --color --debuginfo 2 $LIB_ARGS $OUTPUT_ARGS $SOURCE_FILE
diff --git a/vendor/glfw-rs b/vendor/glfw-rs
index 2dfff939..e68f0bab 160000
--- a/vendor/glfw-rs
+++ b/vendor/glfw-rs
@@ -1 +1 @@
-Subproject commit 2dfff93943d373d80f342b72a2e056142d437147
+Subproject commit e68f0bab59add1954927c4c240fb373e1bac0dec
diff --git a/vendor/rust b/vendor/rust
index 4735ee5e..fed804d4 160000
--- a/vendor/rust
+++ b/vendor/rust
@@ -1 +1 @@
-Subproject commit 4735ee5ea3fbe5850b2ce7ea134ca571b831f378
+Subproject commit fed804d442a7ed776801499fd0e3952e623e2797