diff --git a/AUTHORS.txt b/AUTHORS.txt index f0b3fe19e5c35..5f316744021ef 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -314,7 +314,6 @@ David Szotten David Vazgenovich Shakaryan David Voit Davis Silverman -defuz Denis Defreyne DenisKolodin Derecho @@ -502,6 +501,7 @@ Isaac Aggrey Isaac Dupree Isaac Ge Ivan Enderlin +Ivan Ivaschenko Ivan Jager Ivan Petkov Ivan Radanov Ivanov diff --git a/src/doc/trpl/error-handling.md b/src/doc/trpl/error-handling.md index c693cceeac482..68671cef70740 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(), } }