Change all try's into ?s

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

1 files changed, 19 insertions, 19 deletions

diff --git a/src/model/utils.rs b/src/model/utils.rs
index 9b4f6e4..2668142 100644
--- a/src/model/utils.rs
+++ b/src/model/utils.rs
@@ -27,18 +27,18 @@ use ::ext::cache::ChannelRef;
 #[macro_escape]
 macro_rules! req {
     ($opt:expr) => {
-        try!($opt.ok_or(Error::Decode(concat!("Type mismatch in model:",
+        $opt.ok_or(Error::Decode(concat!("Type mismatch in model:",
                                               line!(),
                                               ": ",
                                               stringify!($opt)),
-                                      Value::Null)))
+                                      Value::Null))?
     }
 }
 
 pub fn decode_emojis(value: Value) -> Result<HashMap<EmojiId, Emoji>> {
     let mut emojis = HashMap::new();
 
-    for emoji in try!(decode_array(value, Emoji::decode)) {
+    for emoji in decode_array(value, Emoji::decode)? {
         emojis.insert(emoji.id, emoji);
     }
 
@@ -91,7 +91,7 @@ pub fn decode_id(value: Value) -> Result<u64> {
 pub fn decode_members(value: Value) -> Result<HashMap<UserId, Member>> {
     let mut members = HashMap::new();
 
-    for member in try!(decode_array(value, Member::decode)) {
+    for member in decode_array(value, Member::decode)? {
         members.insert(member.user.id, member);
     }
 
@@ -104,11 +104,11 @@ pub fn decode_notes(value: Value) -> Result<HashMap<UserId, String>> {
     let mut notes = HashMap::new();
 
     for (key, value) in into_map(value).unwrap_or(BTreeMap::default()) {
-        let id = UserId(try!(key.parse::<u64>()
+        let id = UserId(key.parse::<u64>()
             .map_err(|_| Error::Decode("Invalid user id in notes",
-                                       Value::String(key)))));
+                                       Value::String(key)))?);
 
-        notes.insert(id, try!(into_string(value)));
+        notes.insert(id, into_string(value)?);
     }
 
     Ok(notes)
@@ -117,7 +117,7 @@ pub fn decode_notes(value: Value) -> Result<HashMap<UserId, String>> {
 pub fn decode_presences(value: Value) -> Result<HashMap<UserId, Presence>> {
     let mut presences = HashMap::new();
 
-    for presence in try!(decode_array(value, Presence::decode)) {
+    for presence in decode_array(value, Presence::decode)? {
         presences.insert(presence.user_id, presence);
     }
 
@@ -128,7 +128,7 @@ pub fn decode_private_channels(value: Value)
     -> Result<HashMap<ChannelId, Channel>> {
     let mut private_channels = HashMap::new();
 
-    for private_channel in try!(decode_array(value, Channel::decode)) {
+    for private_channel in decode_array(value, Channel::decode)? {
         let id = match private_channel {
             Channel::Group(ref group) => group.channel_id,
             Channel::Private(ref channel) => channel.id,
@@ -145,7 +145,7 @@ pub fn decode_read_states(value: Value)
     -> Result<HashMap<ChannelId, ReadState>> {
     let mut read_states = HashMap::new();
 
-    for read_state in try!(decode_array(value, ReadState::decode)) {
+    for read_state in decode_array(value, ReadState::decode)? {
         read_states.insert(read_state.id, read_state);
     }
 
@@ -156,7 +156,7 @@ pub fn decode_relationships(value: Value)
     -> Result<HashMap<UserId, Relationship>> {
     let mut relationships = HashMap::new();
 
-    for relationship in try!(decode_array(value, Relationship::decode)) {
+    for relationship in decode_array(value, Relationship::decode)? {
         relationships.insert(relationship.id, relationship);
     }
 
@@ -166,7 +166,7 @@ pub fn decode_relationships(value: Value)
 pub fn decode_roles(value: Value) -> Result<HashMap<RoleId, Role>> {
     let mut roles = HashMap::new();
 
-    for role in try!(decode_array(value, Role::decode)) {
+    for role in decode_array(value, Role::decode)? {
         roles.insert(role.id, role);
     }
 
@@ -174,20 +174,20 @@ pub fn decode_roles(value: Value) -> Result<HashMap<RoleId, Role>> {
 }
 
 pub fn decode_shards(value: Value) -> Result<[u8; 2]> {
-    let array = try!(into_array(value));
+    let array = into_array(value)?;
 
     Ok([
-        req!(try!(array.get(0)
-            .ok_or(Error::Client(ClientError::InvalidShards))).as_u64()) as u8,
-        req!(try!(array.get(1)
-            .ok_or(Error::Client(ClientError::InvalidShards))).as_u64()) as u8,
+        req!(array.get(0)
+            .ok_or(Error::Client(ClientError::InvalidShards))?.as_u64()) as u8,
+        req!(array.get(1)
+            .ok_or(Error::Client(ClientError::InvalidShards))?.as_u64()) as u8,
     ])
 }
 
 pub fn decode_users(value: Value) -> Result<HashMap<UserId, User>> {
     let mut users = HashMap::new();
 
-    for user in try!(decode_array(value, User::decode)) {
+    for user in decode_array(value, User::decode)? {
         users.insert(user.id, user);
     }
 
@@ -198,7 +198,7 @@ pub fn decode_voice_states(value: Value)
     -> Result<HashMap<UserId, VoiceState>> {
     let mut voice_states = HashMap::new();
 
-    for voice_state in try!(decode_array(value, VoiceState::decode)) {
+    for voice_state in decode_array(value, VoiceState::decode)? {
         voice_states.insert(voice_state.user_id, voice_state);
     }