---

yaml
---
r: 30122
b: refs/heads/incoming
c: 5d56da1
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 38fee9526a313104e3f869bf07c24b0c1d203d11
+refs/heads/incoming: 5d56da1678c00ccff2c4c680de3f2245deef172a
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/hash.rs

@@ -131,24 +131,34 @@ impl &SipState : io::Writer {
     // Methods for io::writer
     fn write(msg: &[const u8]) {
 
-        #macro[[#u8to64_le(buf,i),
-                (buf[0+i] as u64 |
-                 buf[1+i] as u64 << 8 |
-                 buf[2+i] as u64 << 16 |
-                 buf[3+i] as u64 << 24 |
-                 buf[4+i] as u64 << 32 |
-                 buf[5+i] as u64 << 40 |
-                 buf[6+i] as u64 << 48 |
-                 buf[7+i] as u64 << 56)]];
-
-        #macro[[#rotl(x,b), (x << b) | (x >> (64 - b))]];
-
-        #macro[[#compress(v0,v1,v2,v3), {
-            v0 += v1; v1 = #rotl(v1, 13); v1 ^= v0; v0 = #rotl(v0, 32);
-            v2 += v3; v3 = #rotl(v3, 16); v3 ^= v2;
-            v0 += v3; v3 = #rotl(v3, 21); v3 ^= v0;
-            v2 += v1; v1 = #rotl(v1, 17); v1 ^= v2; v2 = #rotl(v2, 32);
-        }]];
+        macro_rules! u8to64_le (
+            ($buf:expr, $i:expr) =>
+            ($buf[0+$i] as u64 |
+             $buf[1+$i] as u64 << 8 |
+             $buf[2+$i] as u64 << 16 |
+             $buf[3+$i] as u64 << 24 |
+             $buf[4+$i] as u64 << 32 |
+             $buf[5+$i] as u64 << 40 |
+             $buf[6+$i] as u64 << 48 |
+             $buf[7+$i] as u64 << 56)
+        );
+
+        macro_rules! rotl (
+            ($x:expr, $b:expr) =>
+            (($x << $b) | ($x >> (64 - $b)))
+        );
+
+        macro_rules! compress (
+            ($v0:expr, $v1:expr, $v2:expr, $v3:expr) =>
+            {
+                $v0 += $v1; $v1 = rotl!($v1, 13); $v1 ^= $v0;
+                $v0 = rotl!($v0, 32);
+                $v2 += $v3; $v3 = rotl!($v3, 16); $v3 ^= $v2;
+                $v0 += $v3; $v3 = rotl!($v3, 21); $v3 ^= $v0;
+                $v2 += $v1; $v1 = rotl!($v1, 17); $v1 ^= $v2;
+                $v2 = rotl!($v2, 32);
+            }
+        );
 
         let length = msg.len();
         self.length += length;

branches/incoming/src/libcore/run.rs

@@ -321,8 +321,8 @@ fn program_output(prog: &str, args: &[~str]) ->
                 errs = s;
             }
             (n, _) => {
-                fail(#fmt("program_output received an unexpected file \
-                  number: %u", n));
+                fail(fmt!("program_output received an unexpected file \
+                           number: %u", n));
             }
         };
         count -= 1;

branches/incoming/src/libcore/vec.rs

@@ -541,7 +541,7 @@ fn pop<T>(&v: ~[const T]) -> T {
 fn swap_remove<T>(&v: ~[const T], index: uint) -> T {
     let ln = len(v);
     if index >= ln {
-        fail #fmt("vec::swap_remove - index %u >= length %u", index, ln);
+        fail fmt!("vec::swap_remove - index %u >= length %u", index, ln);
     }
     let lastptr = ptr::mut_addr_of(v[ln - 1]);
     unsafe {