Auto merge of #29657 - defuz:patch-2, r=steveklabnik

r? @steveklabnik

Author: bors

AUTHORS.txt

@@ -314,7 +314,6 @@ David Szotten <[email protected]>
 David Vazgenovich Shakaryan <[email protected]>
 David Voit <[email protected]>
 Davis Silverman <[email protected]>
-defuz <[email protected]>
 Denis Defreyne <[email protected]>
 DenisKolodin <[email protected]>
 Derecho <[email protected]>
@@ -502,6 +501,7 @@ Isaac Aggrey <[email protected]>
 Isaac Dupree <[email protected]>
 Isaac Ge <[email protected]>
 Ivan Enderlin <[email protected]>
+Ivan Ivaschenko <[email protected]>
 Ivan Jager <[email protected]>
 Ivan Petkov <[email protected]>
 Ivan Radanov Ivanov <[email protected]>

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(),
         }
     }