From c32caba9b6d3c2ab3a6b1e392bb31b8c75048571 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Sat, 24 Jan 2015 03:43:48 +0100
Subject: [PATCH 1/2] Update dependencies

---
 deps/regex       | 2 +-
 deps/rust-crypto | 2 +-
 deps/time        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/regex b/deps/regex
index 094a68530..10edff6bb 160000
--- a/deps/regex
+++ b/deps/regex
@@ -1 +1 @@
-Subproject commit 094a68530a6550d5158988ec37afea75b95bbac9
+Subproject commit 10edff6bb76f1c9f4423f3bb8ad373d0c7a69773
diff --git a/deps/rust-crypto b/deps/rust-crypto
index 716c4241e..d80341c51 160000
--- a/deps/rust-crypto
+++ b/deps/rust-crypto
@@ -1 +1 @@
-Subproject commit 716c4241e9a8e1e53dde4380eac2b454682ae81c
+Subproject commit d80341c5169649e88f2e89139049c596874803ab
diff --git a/deps/time b/deps/time
index 7f105d4dd..9012258dc 160000
--- a/deps/time
+++ b/deps/time
@@ -1 +1 @@
-Subproject commit 7f105d4dd2bde23d4b8516dc02566cfc46b60b22
+Subproject commit 9012258dcbf6416909b57205b928c4a5f048881e

From cb1dd390bbe8ca2ba50d4c1b9588902506ec3747 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Sat, 24 Jan 2015 03:56:37 +0100
Subject: [PATCH 2/2] base64, cp: fix build

---
 src/base64/base64.rs | 2 +-
 src/cp/cp.rs         | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/base64/base64.rs b/src/base64/base64.rs
index d677554dc..2163c0b06 100644
--- a/src/base64/base64.rs
+++ b/src/base64/base64.rs
@@ -129,7 +129,7 @@ fn decode(input: &mut Reader, ignore_garbage: bool) {
             }
         }
         Err(s) => {
-            crash!(1, "error: {} ({})", s.description(), s.detail().unwrap_or("".to_string()));
+            crash!(1, "error: {} ({:?})", s.description(), s);
         }
     }
 }
diff --git a/src/cp/cp.rs b/src/cp/cp.rs
index 6416f71bc..213aa486f 100644
--- a/src/cp/cp.rs
+++ b/src/cp/cp.rs
@@ -117,8 +117,7 @@ fn copy(matches: getopts::Matches) {
 
         let io_result = fs::copy(source, &dest);
 
-        if io_result.is_err() {
-            let err = io_result.unwrap_err();
+        if let Err(err) = io_result {
             error!("error: {}", err.to_string());
             panic!();
         }
@@ -142,8 +141,7 @@ fn copy(matches: getopts::Matches) {
 
             let io_result = fs::copy(source, &full_dest);
 
-            if io_result.is_err() {
-                let err = io_result.unwrap_err();
+            if let Err(err) = io_result {
                 error!("error: {}", err.to_string());
                 panic!()
             }