rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

libstd: convert chained ifs to a match in base64.

Browse Source
This commit is contained in:
Huon Wilson
2013-05-08 23:50:15 +10:00
parent b6f9295654
commit ad5ee00c93
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libstd/base64.rs
View File

@@ -156,17 +156,13 @@ impl FromBase64 for ~[u8] {
let ch = self[i] as char; let ch = self[i] as char;
n <<= 6u; n <<= 6u;
if ch >= 'A' && ch <= 'Z' { match ch {
n |= (ch as uint) - 0x41u; 'A'..'Z' => n |= (ch as uint) - 0x41,
} else if ch >= 'a' && ch <= 'z' { 'a'..'z' => n |= (ch as uint) - 0x47,
n |= (ch as uint) - 0x47u; '0'..'9' => n |= (ch as uint) + 0x04,
} else if ch >= '0' && ch <= '9' { '+' => n |= 0x3E,
n |= (ch as uint) + 0x04u; '/' => n |= 0x3F,
} else if ch == '+' { '=' => {
n |= 0x3Eu;
} else if ch == '/' {
n |= 0x3Fu;
} else if ch == '=' {
match len - i { match len - i {
1u => { 1u => {
r.push(((n >> 16u) & 0xFFu) as u8); r.push(((n >> 16u) & 0xFFu) as u8);
@@ -179,8 +175,8 @@ impl FromBase64 for ~[u8] {
} }
_ => fail!(~"invalid base64 padding") _ => fail!(~"invalid base64 padding")
} }
} else { }
fail!(~"invalid base64 character"); _ => fail!(~"invalid base64 character")
} }
i += 1u; i += 1u;