Skip to content

Removing unnecessary hack from the error handling chapter #29657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 6, 2015
Merged

Removing unnecessary hack from the error handling chapter #29657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d071bd0
Removing the hack from error handling chapter, which is does not make…
defuz Nov 6, 2015
0ccd883
Rename me in AUTHORS.txt
defuz Nov 6, 2015
1ebdb73
Opps, fix incorrect call
defuz Nov 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AUTHORS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]>
Expand Down Expand Up @@ -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]>
Expand Down
6 changes: 1 addition & 5 deletions src/doc/trpl/error-handling.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
}
}

Expand Down