---

yaml
---
r: 210839
b: refs/heads/try
c: eef6b4a
h: refs/heads/master
i:
  210837: 504808b
  210835: 5279ecb
  210831: 8c02b40
v: v3

Author: erickt

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 13a4b83c1a73260b9c34a66d3bde62ff09d01863
+refs/heads/try: eef6b4a37b9b7a1753bb91016c36435ad66309dc
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/doc/trpl/dining-philosophers.md

@@ -396,7 +396,7 @@ let handles: Vec<_> = philosophers.into_iter().map(|p| {
 }).collect();
 ```
 
-While this is only five lines, they’re a dense five. Let’s break it down.
+While this is only five lines, they’re a dense four. Let’s break it down.
 
 ```rust,ignore
 let handles: Vec<_> = 

branches/try/src/doc/trpl/guessing-game.md

@@ -27,7 +27,7 @@ Check out the generated `Cargo.toml`:
 [package]
 
 name = "guessing_game"
-version = "0.1.0"
+version = "0.0.1"
 authors = ["Your Name <[email protected]>"]
 ```
 
@@ -46,7 +46,7 @@ Let’s try compiling what Cargo gave us:
 
 ```{bash}
 $ cargo build
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
 ```
 
 Excellent! Open up your `src/main.rs` again. We’ll be writing all of
@@ -58,7 +58,7 @@ Try it out:
 
 ```bash
 $ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
      Running `target/debug/guessing_game`
 Hello, world!
 ```
@@ -727,7 +727,7 @@ Let’s try our program out!
 
 ```bash
 $ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
      Running `target/guessing_game`
 Guess the number!
 The secret number is: 58
@@ -792,7 +792,7 @@ and quit. Observe:
 
 ```bash
 $ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
      Running `target/guessing_game`
 Guess the number!
 The secret number is: 59
@@ -929,7 +929,7 @@ Now we should be good! Let’s try:
 
 ```bash
 $ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
      Running `target/guessing_game`
 Guess the number!
 The secret number is: 61

branches/try/src/libsyntax/print/pprust.rs

@@ -287,19 +287,19 @@ pub fn token_to_string(tok: &Token) -> String {
         token::SpecialVarNt(var)    => format!("${}", var.as_str()),
 
         token::Interpolated(ref nt) => match *nt {
-            token::NtExpr(ref e)   => expr_to_string(&**e),
-            token::NtMeta(ref e)   => meta_item_to_string(&**e),
-            token::NtTy(ref e)     => ty_to_string(&**e),
-            token::NtPath(ref e)   => path_to_string(&**e),
-            token::NtItem(..)      => "an interpolated item".to_string(),
-            token::NtBlock(..)     => "an interpolated block".to_string(),
-            token::NtStmt(..)      => "an interpolated statement".to_string(),
-            token::NtPat(..)       => "an interpolated pattern".to_string(),
-            token::NtIdent(..)     => "an interpolated identifier".to_string(),
-            token::NtTT(..)        => "an interpolated tt".to_string(),
-            token::NtArm(..)       => "an interpolated arm".to_string(),
-            token::NtImplItem(..)  => "an interpolated impl item".to_string(),
-            token::NtTraitItem(..) => "an interpolated trait item".to_string(),
+            token::NtExpr(ref e)      => expr_to_string(&**e),
+            token::NtMeta(ref e)      => meta_item_to_string(&**e),
+            token::NtTy(ref e)        => ty_to_string(&**e),
+            token::NtPath(ref e)      => path_to_string(&**e),
+            token::NtItem(ref e)      => item_to_string(&**e),
+            token::NtBlock(ref e)     => block_to_string(&**e),
+            token::NtStmt(ref e)      => stmt_to_string(&**e),
+            token::NtPat(ref e)       => pat_to_string(&**e),
+            token::NtIdent(ref e)     => ident_to_string(&**e),
+            token::NtTT(ref e)        => tt_to_string(&**e),
+            token::NtArm(ref e)       => arm_to_string(&**e),
+            token::NtImplItem(ref e)  => impl_item_to_string(&**e),
+            token::NtTraitItem(ref e) => trait_item_to_string(&**e),
         }
     }
 }