---

yaml
---
r: 275631
b: refs/heads/master
c: 79dfa25
h: refs/heads/master
i:
  275629: f3c5cfe
  275627: 78ab3c7
  275623: 71fb7b8
  275615: 38e5bb9

Author: ranma42

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7b33d39da93a9873fa002c6875c934fd13ec7d4a
+refs/heads/master: 79dfa2590006e50b7c7ba2788a317b56a162175a
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/libcore/char.rs

@@ -300,15 +300,18 @@ impl CharExt for char {
     #[inline]
     fn escape_unicode(self) -> EscapeUnicode {
         let c = self as u32;
+
         // or-ing 1 ensures that for c==0 the code computes that one
         // digit should be printed and (which is the same) avoids the
         // (31 - 32) underflow
         let msb = 31 - (c | 1).leading_zeros();
-        let msdigit = msb / 4;
+
+        // the index of the most significant hex digit
+        let ms_hex_digit = msb / 4;
         EscapeUnicode {
             c: self,
             state: EscapeUnicodeState::Backslash,
-            offset: msdigit as usize,
+            hex_digit_idx: ms_hex_digit as usize,
         }
     }
 
@@ -431,7 +434,11 @@ pub fn encode_utf16_raw(mut ch: u32, dst: &mut [u16]) -> Option<usize> {
 pub struct EscapeUnicode {
     c: char,
     state: EscapeUnicodeState,
-    offset: usize,
+
+    // The index of the next hex digit to be printed (0 if none),
+    // i.e. the number of remaining hex digits to be printed;
+    // increasing from the least significant digit: 0x543210
+    hex_digit_idx: usize,
 }
 
 #[derive(Clone)]
@@ -463,11 +470,11 @@ impl Iterator for EscapeUnicode {
                 Some('{')
             }
             EscapeUnicodeState::Value => {
-                let c = from_digit(((self.c as u32) >> (self.offset * 4)) & 0xf, 16).unwrap();
-                if self.offset == 0 {
+                let c = from_digit(((self.c as u32) >> (self.hex_digit_idx * 4)) & 0xf, 16).unwrap();
+                if self.hex_digit_idx == 0 {
                     self.state = EscapeUnicodeState::RightBrace;
                 } else {
-                    self.offset -= 1;
+                    self.hex_digit_idx -= 1;
                 }
                 Some(c)
             }
@@ -488,7 +495,7 @@ impl Iterator for EscapeUnicode {
             EscapeUnicodeState::RightBrace => 1,
             EscapeUnicodeState::Done => 0,
         };
-        let n = n + self.offset;
+        let n = n + self.hex_digit_idx;
         (n, Some(n))
     }
 }