---

yaml
---
r: 62815
b: refs/heads/snap-stage3
c: a037fa4
h: refs/heads/master
i:
  62813: bf791a7
  62811: cfec683
  62807: 5faca9c
  62799: 0864ef3
  62783: 302d5cf
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 844b5cff363cdb4ca2baa9152263a5f14a0dcdb0
+refs/heads/snap-stage3: a037fa4da3ce71d23e27d62485cc5d0f6280ed58
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/base64.rs

@@ -113,7 +113,7 @@ pub trait FromBase64 {
     fn from_base64(&self) -> ~[u8];
 }
 
-impl FromBase64 for ~[u8] {
+impl<'self> FromBase64 for &'self [u8] {
     /**
      * Convert base64 `u8` vector into u8 byte values.
      * Every 4 encoded characters is converted into 3 octets, modulo padding.
@@ -188,7 +188,7 @@ impl FromBase64 for ~[u8] {
     }
 }
 
-impl FromBase64 for ~str {
+impl<'self> FromBase64 for &'self str {
     /**
      * Convert any base64 encoded string (literal, `@`, `&`, or `~`)
      * to the byte values it encodes.
@@ -227,23 +227,23 @@ mod tests {
 
     #[test]
     fn test_to_base64() {
-        assert_eq!((~"").to_base64(), ~"");
-        assert!((~"f").to_base64()      == ~"Zg==");
-        assert_eq!((~"fo").to_base64(), ~"Zm8=");
-        assert_eq!((~"foo").to_base64(), ~"Zm9v");
-        assert!((~"foob").to_base64()   == ~"Zm9vYg==");
-        assert_eq!((~"fooba").to_base64(), ~"Zm9vYmE=");
-        assert_eq!((~"foobar").to_base64(), ~"Zm9vYmFy");
+        assert_eq!("".to_base64(), ~"");
+        assert_eq!("f".to_base64(), ~"Zg==");
+        assert_eq!("fo".to_base64(), ~"Zm8=");
+        assert_eq!("foo".to_base64(), ~"Zm9v");
+        assert_eq!("foob".to_base64(), ~"Zm9vYg==");
+        assert_eq!("fooba".to_base64(), ~"Zm9vYmE=");
+        assert_eq!("foobar".to_base64(), ~"Zm9vYmFy");
     }
 
     #[test]
     fn test_from_base64() {
-        assert_eq!((~"").from_base64(), str::to_bytes(""));
-        assert!((~"Zg==").from_base64() == str::to_bytes("f"));
-        assert_eq!((~"Zm8=").from_base64(), str::to_bytes("fo"));
-        assert_eq!((~"Zm9v").from_base64(), str::to_bytes("foo"));
-        assert!((~"Zm9vYg==").from_base64() == str::to_bytes("foob"));
-        assert_eq!((~"Zm9vYmE=").from_base64(), str::to_bytes("fooba"))
-        assert_eq!((~"Zm9vYmFy").from_base64(), str::to_bytes("foobar"));
+        assert_eq!("".from_base64(), str::to_bytes(""));
+        assert_eq!("Zg==".from_base64(), str::to_bytes("f"));
+        assert_eq!("Zm8=".from_base64(), str::to_bytes("fo"));
+        assert_eq!("Zm9v".from_base64(), str::to_bytes("foo"));
+        assert_eq!("Zm9vYg==".from_base64(), str::to_bytes("foob"));
+        assert_eq!("Zm9vYmE=".from_base64(), str::to_bytes("fooba"))
+        assert_eq!("Zm9vYmFy".from_base64(), str::to_bytes("foobar"));
     }
 }