From 918122091700e109631d94f5e436375b0b51282e Mon Sep 17 00:00:00 2001
From: Jimmy Cuadra <jimmy@jimmycuadra.com>
Date: Fri, 24 Mar 2017 01:31:33 -0700
Subject: [PATCH] Update TryFrom::Err to TryFrom::Error.

---
 src/lib.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 05e1a1c3..1d04ed57 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -493,13 +493,13 @@ impl Deserialize for UserId {
 }
 
 impl<'a> TryFrom<&'a str> for EventId {
-    type Err = Error;
+    type Error = Error;
 
     /// Attempts to create a new Matrix event ID from a string representation.
     ///
     /// The string must include the leading $ sigil, the opaque ID, a literal colon, and a valid
     /// server name.
-    fn try_from(event_id: &'a str) -> Result<Self, Self::Err> {
+    fn try_from(event_id: &'a str) -> Result<Self, Self::Error> {
         let (opaque_id, host, port) = parse_id('$', event_id)?;
 
         Ok(EventId {
@@ -511,7 +511,7 @@ impl<'a> TryFrom<&'a str> for EventId {
 }
 
 impl<'a> TryFrom<&'a str> for RoomAliasId {
-    type Err = Error;
+    type Error = Error;
 
     /// Attempts to create a new Matrix room alias ID from a string representation.
     ///
@@ -529,7 +529,7 @@ impl<'a> TryFrom<&'a str> for RoomAliasId {
 }
 
 impl<'a> TryFrom<&'a str> for RoomId {
-    type Err = Error;
+    type Error = Error;
 
     /// Attempts to create a new Matrix room ID from a string representation.
     ///
@@ -547,7 +547,7 @@ impl<'a> TryFrom<&'a str> for RoomId {
 }
 
 impl<'a> TryFrom<&'a str> for RoomIdOrAliasId {
-    type Err = Error;
+    type Error = Error;
 
     /// Attempts to create a new Matrix room ID or a room alias ID from a string representation.
     ///
@@ -576,7 +576,7 @@ impl<'a> TryFrom<&'a str> for RoomIdOrAliasId {
 }
 
 impl<'a> TryFrom<&'a str> for UserId {
-    type Err = Error;
+    type Error = Error;
 
     /// Attempts to create a new Matrix user ID from a string representation.
     ///