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] 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!()
             }