Change all try's into ?s

This breaks compatibility with < 1.13, but we didn't support that anyway.

2 files changed, 9 insertions, 9 deletions

diff --git a/src/utils/macros.rs b/src/utils/macros.rs
index e8f74dd..2ba37e0 100644
--- a/src/utils/macros.rs
+++ b/src/utils/macros.rs
@@ -1,25 +1,25 @@
 macro_rules! request {
     ($route:expr, $method:ident($body:expr), $url:expr, $($rest:tt)*) => {{
         let client = HyperClient::new();
-        try!(request($route, || client
+        request($route, || client
             .$method(&format!(api!($url), $($rest)*))
-            .body(&$body)))
+            .body(&$body))?
     }};
     ($route:expr, $method:ident($body:expr), $url:expr) => {{
         let client = HyperClient::new();
-        try!(request($route, || client
+        request($route, || client
             .$method(api!($url))
-            .body(&$body)))
+            .body(&$body))?
     }};
     ($route:expr, $method:ident, $url:expr, $($rest:tt)*) => {{
         let client = HyperClient::new();
-        try!(request($route, || client
-            .$method(&format!(api!($url), $($rest)*))))
+        request($route, || client
+            .$method(&format!(api!($url), $($rest)*)))?
     }};
     ($route:expr, $method:ident, $url:expr) => {{
         let client = HyperClient::new();
-        try!(request($route, || client
-            .$method(api!($url))))
+        request($route, || client
+            .$method(api!($url)))?
     }};
 }
 
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 2401a1b..a7a14a3 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -186,7 +186,7 @@ pub fn read_image<P: AsRef<Path>>(path: P) -> Result<String> {
     let path = path.as_ref();
 
     let mut v = Vec::default();
-    let mut f = try!(File::open(path));
+    let mut f = File::open(path)?;
     let _ = f.read_to_end(&mut v);
 
     let b64 = base64::encode(&v);