---

yaml
---
r: 36345
b: refs/heads/try2
c: 0c11a12
h: refs/heads/master
i:
  36343: 466d33a
v: v3

Author: jesse99

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 27cca5b61b5daaec6f07b9e24c368a595df58060
+refs/heads/try2: 0c11a12bdbfb804c2aef0dc164fd8ecc1f5d3eeb
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/char.rs

@@ -135,7 +135,8 @@ pub pure fn escape_unicode(c: char) -> ~str {
     let mut out = ~"\\";
     unsafe {
         str::push_str(&mut out, str::from_char(c));
-        for uint::range(str::len(s), pad) |_i| { str::push_str(&mut out, ~"0"); }
+        for uint::range(str::len(s), pad) |_i|
+            { str::push_str(&mut out, ~"0"); }
         str::push_str(&mut out, s);
     }
     move out

branches/try2/src/libstd/base64.rs

@@ -15,23 +15,23 @@ impl &[u8]: ToBase64 {
         unsafe {
             let len = self.len();
             str::reserve(&mut s, ((len + 3u) / 4u) * 3u);
-    
+
             let mut i = 0u;
-    
+
             while i < len - (len % 3u) {
                 let n = (self[i] as uint) << 16u |
                         (self[i + 1u] as uint) << 8u |
                         (self[i + 2u] as uint);
-    
+
                 // This 24-bit number gets separated into four 6-bit numbers.
                 str::push_char(&mut s, chars[(n >> 18u) & 63u]);
                 str::push_char(&mut s, chars[(n >> 12u) & 63u]);
                 str::push_char(&mut s, chars[(n >> 6u) & 63u]);
                 str::push_char(&mut s, chars[n & 63u]);
-    
+
                 i += 3u;
             }
-    
+
             // Heh, would be cool if we knew this was exhaustive
             // (the dream of bounded integer types)
             match len % 3 {
@@ -44,7 +44,8 @@ impl &[u8]: ToBase64 {
                 str::push_char(&mut s, '=');
               }
               2 => {
-                let n = (self[i] as uint) << 16u | (self[i + 1u] as uint) << 8u;
+                let n = (self[i] as uint) << 16u |
+                    (self[i + 1u] as uint) << 8u;
                 str::push_char(&mut s, chars[(n >> 18u) & 63u]);
                 str::push_char(&mut s, chars[(n >> 12u) & 63u]);
                 str::push_char(&mut s, chars[(n >> 6u) & 63u]);
@@ -85,11 +86,11 @@ impl ~[u8]: FromBase64 {
             let mut i = 0u;
             while i < len {
                 let mut n = 0u;
-    
+
                 for iter::repeat(4u) {
                     let ch = self[i] as char;
                     n <<= 6u;
-    
+
                     if ch >= 'A' && ch <= 'Z' {
                         n |= (ch as uint) - 0x41u;
                     } else if ch >= 'a' && ch <= 'z' {
@@ -116,10 +117,10 @@ impl ~[u8]: FromBase64 {
                     } else {
                         fail ~"invalid base64 character";
                     }
-    
+
                     i += 1u;
                 };
-    
+
                 r.push(((n >> 16u) & 0xFFu) as u8);
                 r.push(((n >> 8u ) & 0xFFu) as u8);
                 r.push(((n       ) & 0xFFu) as u8);