Imported Upstream version 1.9.0+dfsg1

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

diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs
index 609ebe8546164d1872790a48c32a6bb0a8e0107c..31b71dbc80b62c2bd3ce75f5e78778d6b0567590 100644 (file)
--- a/src/libserialize/hex.rs
+++ b/src/libserialize/hex.rs
@@ -132,7 +132,10 @@ impl FromHex for str {
                     buf >>= 4;
                     continue
                 }
-                _ => return Err(InvalidHexCharacter(self.char_at(idx), idx)),
+                _ => {
+                    let ch = self[idx..].chars().next().unwrap();
+                    return Err(InvalidHexCharacter(ch, idx))
+                }
             }
 
             modulus += 1;