Auto merge of #67330 - golddranks:split_inclusive, r=kodraus

[rust.git] / src / libserialize / hex.rs

diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs
index 95d92f311ed3cdb48db3fc6ca6c61920439b9a05..cfb165a3d4397d4848774f6e1b0aece763a49c24 100644 (file)
--- a/src/libserialize/hex.rs
+++ b/src/libserialize/hex.rs
@@ -2,8 +2,8 @@
 
 pub use self::FromHexError::*;
 
-use std::fmt;
 use std::error;
+use std::fmt;
 
 /// A trait for converting a value to hexadecimal encoding
 pub trait ToHex {
@@ -37,9 +37,7 @@ fn to_hex(&self) -> String {
             v.push(CHARS[(byte & 0xf) as usize]);
         }
 
-        unsafe {
-            String::from_utf8_unchecked(v)
-        }
+        unsafe { String::from_utf8_unchecked(v) }
     }
 }
 
@@ -62,22 +60,15 @@ pub enum FromHexError {
 impl fmt::Display for FromHexError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
-            InvalidHexCharacter(ch, idx) =>
-                write!(f, "Invalid character '{}' at position {}", ch, idx),
+            InvalidHexCharacter(ch, idx) => {
+                write!(f, "Invalid character '{}' at position {}", ch, idx)
+            }
             InvalidHexLength => write!(f, "Invalid input length"),
         }
     }
 }
 
-impl error::Error for FromHexError {
-    fn description(&self) -> &str {
-        match *self {
-            InvalidHexCharacter(..) => "invalid character",
-            InvalidHexLength => "invalid length",
-        }
-    }
-}
-
+impl error::Error for FromHexError {}
 
 impl FromHex for str {
     /// Converts any hexadecimal encoded string (literal, `@`, `&`, or `~`)
@@ -118,13 +109,13 @@ fn from_hex(&self) -> Result<Vec<u8>, FromHexError> {
                 b'A'..=b'F' => buf |= byte - b'A' + 10,
                 b'a'..=b'f' => buf |= byte - b'a' + 10,
                 b'0'..=b'9' => buf |= byte - b'0',
-                b' '|b'\r'|b'\n'|b'\t' => {
+                b' ' | b'\r' | b'\n' | b'\t' => {
                     buf >>= 4;
-                    continue
+                    continue;
                 }
                 _ => {
                     let ch = self[idx..].chars().next().unwrap();
-                    return Err(InvalidHexCharacter(ch, idx))
+                    return Err(InvalidHexCharacter(ch, idx));
                 }
             }