about summary refs log tree commit diff
diff options
context:
space:
mode:
authorIvan Ivaschenko <defuz.net@gmail.com>2015-11-06 13:44:42 +0200
committerIvan Ivaschenko <defuz.net@gmail.com>2015-11-06 13:44:42 +0200
commitd071bd00bf53fca38d7f3a29d3651bfe9b3ad90e (patch)
tree62c349bc6fe387645a34df59a01f7521f74fd60c
parent6878fce9c707dd7449df1981303dfc2c1fedabab (diff)
Removing the hack from error handling chapter, which is does not make sense anymore.
-rw-r--r--src/doc/trpl/error-handling.md6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/doc/trpl/error-handling.md b/src/doc/trpl/error-handling.md
index c693cceeac4..9ee9cf6e1e4 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),
         }
     }