From 051f1ff562ad1d88fd815f2b8b9905cd10dd2764 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 23 Aug 2011 21:52:01 -0700
Subject: Convert std::sha1 to istrs. Issue #855

---
 src/lib/sha1.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/sha1.rs b/src/lib/sha1.rs
index 9d5ec605792..c2d63af9a18 100644
--- a/src/lib/sha1.rs
+++ b/src/lib/sha1.rs
@@ -10,12 +10,12 @@ type sha1 = obj {
     // Provide message input as bytes
     fn input(&[u8]);
     // Provide message input as string
-    fn input_str(&str);
+    fn input_str(&istr);
     // Read the digest as a vector of 20 bytes. After calling this no further
     // input may provided until reset is called
     fn result() -> [u8];
     // Same as above, just a hex-string version.
-    fn result_str() -> str;
+    fn result_str() -> istr;
     // Reset the sha1 state for reuse. This is called
     // automatically during construction
     fn reset();
@@ -215,13 +215,13 @@ fn mk_sha1() -> sha1 {
             st.computed = false;
         }
         fn input(msg: &[u8]) { add_input(st, msg); }
-        fn input_str(msg: &str) { add_input(st, str::bytes(msg)); }
+        fn input_str(msg: &istr) { add_input(st, istr::bytes(msg)); }
         fn result() -> [u8] { ret mk_result(st); }
-        fn result_str() -> str {
+        fn result_str() -> istr {
             let r = mk_result(st);
-            let s = "";
+            let s = ~"";
             for b: u8 in r {
-                s += istr::to_estr(uint::to_str(b as uint, 16u));
+                s += uint::to_str(b as uint, 16u);
             }
             ret s;
         }
-- 
cgit 1.4.1-3-g733a5