---

yaml
---
r: 47799
b: refs/heads/incoming
c: f684a8a
h: refs/heads/master
i:
  47797: a4a79a7
  47795: 517bf46
  47791: 861043a
v: v3

Author: Kimundi

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 2ec958db5ae37f193d4d632635818241b134a617
+refs/heads/incoming: f684a8a56be054997c1df8807eac9d5cad221979
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial.md

@@ -114,8 +114,9 @@ for more information on them.
 
 When complete, `make install` will place several programs into
 `/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
-API-documentation tool; `cargo`, the Rust package manager;
-and `rusti`, the Rust REPL.
+API-documentation tool; `rustpkg`, the Rust package manager;
+`rusti`, the Rust REPL; and `rust`, a tool which acts as a unified way to
+call them, either directly or with common command line arguments.
 
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
 [tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
@@ -2184,7 +2185,7 @@ impl Circle for CircleStruct {
 }
 impl Shape for CircleStruct {
     fn area(&self) -> float { pi * square(self.radius) }
-}   
+}
 ~~~~
 
 Notice that methods of `Circle` can call methods on `Shape`, as our

branches/incoming/src/test/bench/core-map.rs

@@ -302,26 +302,26 @@ fn main() {
         }
     };
 
-    let seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    let seed = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 
     {
-        let rng = rand::seeded_rng(seed);
+        let rng = rand::seeded_rng(&seed);
         let mut results = empty_results();
         old_int_benchmarks(rng, num_keys, &mut results);
         old_str_benchmarks(rng, num_keys, &mut results);
         write_results("std::oldmap::HashMap", &results);
     }
 
     {
-        let rng = rand::seeded_rng(seed);
+        let rng = rand::seeded_rng(&seed);
         let mut results = empty_results();
         linear_int_benchmarks(rng, num_keys, &mut results);
         linear_str_benchmarks(rng, num_keys, &mut results);
         write_results("core::hashmap::linear::LinearMap", &results);
     }
 
     {
-        let rng = rand::seeded_rng(seed);
+        let rng = rand::seeded_rng(&seed);
         let mut results = empty_results();
         tree_int_benchmarks(rng, num_keys, &mut results);
         tree_str_benchmarks(rng, num_keys, &mut results);

branches/incoming/src/test/bench/core-set.rs

@@ -152,27 +152,27 @@ fn main() {
         }
     };
 
-    let seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    let seed = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
     let max = 200000;
 
     {
-        let rng = rand::seeded_rng(seed);
+        let rng = rand::seeded_rng(&seed);
         let mut results = empty_results();
         results.bench_int(rng, num_keys, max, || LinearSet::new::<uint>());
         results.bench_str(rng, num_keys, || LinearSet::new::<~str>());
         write_results("core::hashmap::LinearSet", &results);
     }
 
     {
-        let rng = rand::seeded_rng(seed);
+        let rng = rand::seeded_rng(&seed);
         let mut results = empty_results();
         results.bench_int(rng, num_keys, max, || TreeSet::new::<uint>());
         results.bench_str(rng, num_keys, || TreeSet::new::<~str>());
         write_results("std::treemap::TreeSet", &results);
     }
 
     {
-        let rng = rand::seeded_rng(seed);
+        let rng = rand::seeded_rng(&seed);
         let mut results = empty_results();
         results.bench_int(rng, num_keys, max, || BitvSet::new());
         write_results("std::bitv::BitvSet", &results);