min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from miloshadzic/master 

Update syntax for latest Rust master (rust 0.8-pre bbda3fa).
This commit is contained in:
Kevin Ballard 2013-08-05 19:31:12 -07:00
parent 80a2654858 61d7c3ff3a
commit 628994b390
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hash.rs
View File

@ -151,7 +151,7 @@ mod tests {
HashTest(~"A510CD18F7A56852EB0319", ~"577E216843DD11573574D3FB209B97D8"), HashTest(~"A510CD18F7A56852EB0319", ~"577E216843DD11573574D3FB209B97D8"),
HashTest(~"AAED18DBE8938C19ED734A8D", ~"6F80FB775F27E0A4CE5C2F42FC72C5F1")]; HashTest(~"AAED18DBE8938C19ED734A8D", ~"6F80FB775F27E0A4CE5C2F42FC72C5F1")];
for tests.iter().advance |test| { for test in tests.iter() {
hash_test(MD5, test); hash_test(MD5, test);
} }
} }
@ -163,7 +163,7 @@ mod tests {
HashTest(~"616263", ~"A9993E364706816ABA3E25717850C26C9CD0D89D"), HashTest(~"616263", ~"A9993E364706816ABA3E25717850C26C9CD0D89D"),
]; ];
for tests.iter().advance |test| { for test in tests.iter() {
hash_test(SHA1, test); hash_test(SHA1, test);
} }
} }
@ -174,7 +174,7 @@ mod tests {
HashTest(~"616263", ~"BA7816BF8F01CFEA414140DE5DAE2223B00361A396177A9CB410FF61F20015AD") HashTest(~"616263", ~"BA7816BF8F01CFEA414140DE5DAE2223B00361A396177A9CB410FF61F20015AD")
]; ];
for tests.iter().advance |test| { for test in tests.iter() {
hash_test(SHA256, test); hash_test(SHA256, test);
} }
} }

6
hex.rs
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
use std::{uint,vec}; use std::vec;
pub trait ToHex { pub trait ToHex {
fn to_hex(&self) -> ~str; fn to_hex(&self) -> ~str;
@ -27,7 +27,7 @@ impl<'self> ToHex for &'self [u8] {
let mut s = ~""; let mut s = ~"";
for uint::range(0, self.len()) |i| { for i in range(0u, self.len()) {
let x = self[i]; let x = self[i];
@ -50,7 +50,7 @@ impl<'self> FromHex for &'self str {
fn from_hex(&self) -> ~[u8] { fn from_hex(&self) -> ~[u8] {
let mut vec = vec::with_capacity(self.len() / 2); let mut vec = vec::with_capacity(self.len() / 2);
for self.iter().enumerate().advance() |(i,c)| { for (i,c) in self.iter().enumerate() {
let nibble = let nibble =
if c >= '0' && c <= '9' { (c as u8) - 0x30 } if c >= '0' && c <= '9' { (c as u8) - 0x30 }
else if c >= 'a' && c <= 'f' { (c as u8) - (0x61 - 10) } else if c >= 'a' && c <= 'f' { (c as u8) - (0x61 - 10) }