From c69f97542a6071f78d48a743ee94119a93bc9471 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 1 Mar 2019 18:07:56 -0800 Subject: error: Consistently use Display instead of error description() The description method is deprecated and its signature forces less helpful error messages than what Display can provide. BUG=none TEST=cargo check --all-features TEST=cargo check --target aarch64-unknown-linux-gnu Change-Id: I27fc99d59d0ef457c5273dc53e4c563ef439c2c0 Reviewed-on: https://chromium-review.googlesource.com/1497735 Commit-Ready: David Tolnay Tested-by: David Tolnay Tested-by: kokoro Reviewed-by: Dylan Reid --- src/argument.rs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/argument.rs') diff --git a/src/argument.rs b/src/argument.rs index baadb02..224a17c 100644 --- a/src/argument.rs +++ b/src/argument.rs @@ -40,7 +40,7 @@ //! } //! ``` -use std::fmt; +use std::fmt::{self, Display}; use std::result; /// An error with argument parsing. @@ -64,18 +64,20 @@ pub enum Error { PrintHelp, } -impl fmt::Display for Error { +impl Display for Error { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + use self::Error::*; + match self { - Error::Syntax(s) => write!(f, "syntax error: {}", s), - Error::UnknownArgument(s) => write!(f, "unknown argument: {}", s), - Error::ExpectedArgument(s) => write!(f, "expected argument: {}", s), - Error::InvalidValue { value, expected } => { + Syntax(s) => write!(f, "syntax error: {}", s), + UnknownArgument(s) => write!(f, "unknown argument: {}", s), + ExpectedArgument(s) => write!(f, "expected argument: {}", s), + InvalidValue { value, expected } => { write!(f, "invalid value {:?}: {}", value, expected) } - Error::TooManyArguments(s) => write!(f, "too many arguments: {}", s), - Error::ExpectedValue(s) => write!(f, "expected parameter value: {}", s), - Error::PrintHelp => write!(f, "help was requested"), + TooManyArguments(s) => write!(f, "too many arguments: {}", s), + ExpectedValue(s) => write!(f, "expected parameter value: {}", s), + PrintHelp => write!(f, "help was requested"), } } } -- cgit 1.4.1