OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #6796 : sfackler/rust/FromBase64-type-fix, r=bstrie 

Previously, FromBase64 was only implemented on ~[u8] and ~str when
any pointer would do. The implementations of FromBase64 are now
consistent with the implementations of ToBase64.
This commit is contained in:
bors 2013-05-29 08:49:53 -07:00
parent 844b5cff36 b1e7d49b11
commit a037fa4da3
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libextra/base64.rs
View File

@ -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"));
}
}