From d071bd00bf53fca38d7f3a29d3651bfe9b3ad90e Mon Sep 17 00:00:00 2001
From: Ivan Ivaschenko <defuz.net@gmail.com>
Date: Fri, 6 Nov 2015 13:44:42 +0200
Subject: [PATCH 1/3] Removing the hack from error handling chapter, which is
 does not make sense anymore.

---
 src/doc/trpl/error-handling.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/doc/trpl/error-handling.md b/src/doc/trpl/error-handling.md
index c693cceeac482..9ee9cf6e1e435 100644
--- a/src/doc/trpl/error-handling.md
+++ b/src/doc/trpl/error-handling.md
@@ -1137,11 +1137,7 @@ impl error::Error for CliError {
         // implementations.
         match *self {
             CliError::Io(ref err) => err.description(),
-            // Normally we can just write `err.description()`, but the error
-            // type has a concrete method called `description`, which conflicts
-            // with the trait method. For now, we must explicitly call
-            // `description` through the `Error` trait.
-            CliError::Parse(ref err) => error::Error::description(err),
+            CliError::Parse(ref err) => err.description(err),
         }
     }
 

From 0ccd883e7f50c45c8589ea8ae0b4b535daeb7f3a Mon Sep 17 00:00:00 2001
From: Ivan Ivaschenko <defuz.net@gmail.com>
Date: Fri, 6 Nov 2015 13:48:24 +0200
Subject: [PATCH 2/3] Rename me in AUTHORS.txt

---
 AUTHORS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index f0b3fe19e5c35..5f316744021ef 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -314,7 +314,6 @@ David Szotten <davidszotten@gmail.com>
 David Vazgenovich Shakaryan <dvshakaryan@gmail.com>
 David Voit <david.voit@gmail.com>
 Davis Silverman <sinistersnare@gmail.com>
-defuz <defuz.net@gmail.com>
 Denis Defreyne <denis.defreyne@stoneship.org>
 DenisKolodin <DenisKolodin@gmail.com>
 Derecho <derecho@sector5d.org>
@@ -502,6 +501,7 @@ Isaac Aggrey <isaac.aggrey@gmail.com>
 Isaac Dupree <antispam@idupree.com>
 Isaac Ge <acgtyrant@gmail.com>
 Ivan Enderlin <ivan.enderlin@hoa-project.net>
+Ivan Ivaschenko <defuz.net@gmail.com>
 Ivan Jager <aij+git@mrph.org>
 Ivan Petkov <ivanppetkov@gmail.com>
 Ivan Radanov Ivanov <ivanradanov@yahoo.co.uk>

From 1ebdb734aaa7fcfdbf5e80e1006218ee5e3514cd Mon Sep 17 00:00:00 2001
From: Ivan Ivaschenko <defuz.net@gmail.com>
Date: Fri, 6 Nov 2015 13:52:17 +0200
Subject: [PATCH 3/3] Opps, fix incorrect call

---
 src/doc/trpl/error-handling.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/doc/trpl/error-handling.md b/src/doc/trpl/error-handling.md
index 9ee9cf6e1e435..68671cef70740 100644
--- a/src/doc/trpl/error-handling.md
+++ b/src/doc/trpl/error-handling.md
@@ -1137,7 +1137,7 @@ impl error::Error for CliError {
         // implementations.
         match *self {
             CliError::Io(ref err) => err.description(),
-            CliError::Parse(ref err) => err.description(err),
+            CliError::Parse(ref err) => err.description(),
         }
     }