---

yaml
---
r: 24542
b: refs/heads/try2
c: a76ed88
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 41bca84dd95e0ef9ceb9f0a304eca0d62602198b
+refs/heads/try2: a76ed88f54f6e7a3f9a85936a7b4576e2e3f3e78
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/doc/tutorial.md

@@ -17,7 +17,7 @@ As a curly-brace language in the tradition of C, C++, and JavaScript,
 Rust looks a lot like other languages you may be familiar with.
 
 ~~~~
-fn fac(n: int) -> int {
+fn boring_old_factorial(n: int) -> int {
     let mut result = 1, i = 1;
     while i <= n {
         result *= i;
@@ -36,8 +36,65 @@ tendency towards aggressive abbreviation in the keywords—`fn` for
 function, `ret` for return.
 
 You should, however, not conclude that Rust is simply an evolution of
-C. As will become clear in the rest of this tutorial, it goes in
-quite a different direction.
+C. As will become clear in the rest of this tutorial, it goes in quite
+a different direction, with efficient, strongly-typed and memory-safe
+support for many high-level idioms.
+
+Here's a parallel game of rock, paper, scissors to whet your appetite.
+
+~~~~
+use std;
+
+import comm::{listen, methods};
+import task::spawn;
+import iter::repeat;
+import std::rand::{seeded_rng, seed};
+import uint::range;
+import io::println;
+
+fn main() {
+    // Open a channel for receiving game results
+    do listen |result_from_game| {
+
+        let times = 10;
+        let player1 = "graydon";
+        let player2 = "patrick";
+
+        for repeat(times) {
+            // Start another task to play the game
+            do spawn |copy player1, copy player2| {
+                let outcome = play_game(player1, player2);
+                result_from_game.send(outcome);
+            }
+        }
+
+        // Report the results as the games complete
+        for range(0, times) |round| {
+            let winner = result_from_game.recv();
+            println(#fmt("%s wins round #%u", winner, round));
+        }
+
+        fn play_game(player1: str, player2: str) -> str {
+
+            // Our rock/paper/scissors types
+            enum gesture {
+                rock, paper, scissors
+            }
+
+            let rng = seeded_rng(seed());
+            // A small inline function for picking an RPS gesture
+            let pick = || [rock, paper, scissors][rng.gen_uint() % 3];
+
+            // Pick two gestures and decide the result
+            alt (pick(), pick()) {
+                (rock, scissors) | (paper, rock) | (scissors, paper) { copy player1 }
+                (scissors, rock) | (rock, paper) | (paper, scissors) { copy player2 }
+                _ { "tie" }
+            }
+        }
+    }
+}
+~~~~
 
 ## Conventions