---

yaml
---
r: 63603
b: refs/heads/snap-stage3
c: 66fd3c9
h: refs/heads/master
i:
  63601: 9e1e14c
  63599: 6cc6d90
v: v3

Author: Thiez

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: de64ff20ab5f8c961ffda10c3bf168b52a8e4196
+refs/heads/snap-stage3: 66fd3c9e5dd8c9b44237b57f455ba60ef607958b
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/bench/shootout-fasta.rs

@@ -28,7 +28,9 @@ use std::str;
 use std::uint;
 use std::vec;
 
-fn LINE_LENGTH() -> uint { return 60u; }
+static LINE_LENGTH: uint = 60u;
+
+//fn LINE_LENGTH() -> uint { return 60u; }
 
 struct MyRandom {
     last: u32
@@ -81,7 +83,7 @@ fn make_random_fasta(wr: @io::Writer,
     for uint::range(0u, n as uint) |_i| {
         op.push_char(select_random(myrandom_next(rng, 100u32),
                                               copy genelist));
-        if op.len() >= LINE_LENGTH() {
+        if op.len() >= LINE_LENGTH {
             wr.write_line(op);
             op = ~"";
         }
@@ -90,18 +92,20 @@ fn make_random_fasta(wr: @io::Writer,
 }
 
 fn make_repeat_fasta(wr: @io::Writer, id: ~str, desc: ~str, s: ~str, n: int) {
+    wr.write_line(~">" + id + " " + desc);
+    let mut op = str::with_capacity( LINE_LENGTH );
+    let sl = s.len();
     unsafe {
-        wr.write_line(~">" + id + " " + desc);
-        let mut op: ~str = ~"";
-        let sl: uint = s.len();
         for uint::range(0u, n as uint) |i| {
-            str::raw::push_byte(&mut op, s[i % sl]);
-            if op.len() >= LINE_LENGTH() {
-                wr.write_line(op);
-                op = ~"";
+            if (op.len() >= LINE_LENGTH) {
+                wr.write_line( op );
+                op = str::with_capacity( LINE_LENGTH );
             }
+            op.push_char( s[i % sl] as char );
+        }
+        if op.len() > 0 {
+            wr.write_line(op)
         }
-        if op.len() > 0u { wr.write_line(op); }
     }
 }