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 --- net_util/src/lib.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'net_util') diff --git a/net_util/src/lib.rs b/net_util/src/lib.rs index 790fbc3..066b7d8 100644 --- a/net_util/src/lib.rs +++ b/net_util/src/lib.rs @@ -101,14 +101,17 @@ pub enum MacAddressError { ParseOctet(ParseIntError), } -impl fmt::Display for MacAddressError { +impl Display for MacAddressError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match *self { - MacAddressError::InvalidNumOctets(n) => write!(f, "invalid number of octets: {}", n), - MacAddressError::ParseOctet(ref e) => write!(f, "failed to parse octet: {}", e), + use self::MacAddressError::*; + + match self { + InvalidNumOctets(n) => write!(f, "invalid number of octets: {}", n), + ParseOctet(e) => write!(f, "failed to parse octet: {}", e), } } } + /// An Ethernet mac address. This struct is compatible with the C `struct sockaddr`. #[repr(C)] #[derive(Clone, Copy)] @@ -147,7 +150,7 @@ impl FromStr for MacAddress { } } -impl fmt::Display for MacAddress { +impl Display for MacAddress { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!( f, -- cgit 1.4.1