---

yaml
---
r: 207294
b: refs/heads/master
c: 6f69cd6
h: refs/heads/master
v: v3

Author: killercup

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cc50fd6f31f2037acf41d66005fbd820a6eee297
+refs/heads/master: 6f69cd6387bf1975dfc760b939d607c49ff126cb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 857ef6e272e5634cb9f3e6ee50eb6bc2a2e71651
 refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f

trunk/RELEASES.md

@@ -23,7 +23,7 @@ Language
 * Digits of binary and octal literals are [lexed more eagerly][lex] to
   improve error messages and macro behavior. For example, `0b1234` is
   now lexed as `0b1234` instead of two tokens, `0b1` and `234`.
-* Trait bounds [are always invariant][inv], eliminating the need for
+* Trait bounds [are always invariant][inv], eleminating the need for
   the `PhantomFn` and `MarkerTrait` lang items, which have been
   removed.
 * ["-" is no longer a valid character in crate names][cr], the `extern crate
@@ -162,7 +162,7 @@ Misc
 
 
 Version 1.0.0-alpha.2 (February 2015)
-=====================================
+-------------------------------------
 
 * ~1300 changes, numerous bugfixes
 
@@ -260,9 +260,8 @@ Version 1.0.0-alpha.2 (February 2015)
 [ufcs-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0132-ufcs.md
 [un]: https://github.com/rust-lang/rust/pull/22256
 
-
 Version 1.0.0-alpha (January 2015)
-==================================
+----------------------------------
 
   * ~2400 changes, numerous bugfixes
 
@@ -447,9 +446,8 @@ Version 1.0.0-alpha (January 2015)
 [trpl]: http://doc.rust-lang.org/book/index.html
 [rbe]: http://rustbyexample.com/
 
-
 Version 0.12.0 (October 2014)
-=============================
+-----------------------------
 
   * ~1900 changes, numerous bugfixes
 
@@ -570,9 +568,8 @@ Version 0.12.0 (October 2014)
     * Official Rust binaries on Linux are more compatible with older
       kernels and distributions, built on CentOS 5.10.
 
-
 Version 0.11.0 (July 2014)
-==========================
+-------------------------
 
   * ~1700 changes, numerous bugfixes
 
@@ -703,9 +700,8 @@ Version 0.11.0 (July 2014)
     * Error message related to non-exhaustive match expressions have been
       greatly improved.
 
-
 Version 0.10 (April 2014)
-=========================
+-------------------------
 
   * ~1500 changes, numerous bugfixes
 
@@ -870,9 +866,8 @@ Version 0.10 (April 2014)
       * search works across crates that have been rendered to the same output
         directory.
 
-
 Version 0.9 (January 2014)
-==========================
+--------------------------
 
    * ~1800 changes, numerous bugfixes
 
@@ -1036,9 +1031,8 @@ Version 0.9 (January 2014)
       * `rustc` adds a `--dep-info` flag for communicating dependencies to
         build tools.
 
-
 Version 0.8 (September 2013)
-============================
+--------------------------
 
    * ~2200 changes, numerous bugfixes
 
@@ -1192,9 +1186,8 @@ Version 0.8 (September 2013)
       * A new documentation backend, rustdoc_ng, is available for use. It is
         still invoked through the normal `rustdoc` command.
 
-
 Version 0.7 (July 2013)
-=======================
+-----------------------
 
    * ~2000 changes, numerous bugfixes
 
@@ -1309,9 +1302,8 @@ Version 0.7 (July 2013)
       * Various improvements to rustdoc.
       * Improvements to rustpkg (see the detailed release notes).
 
-
 Version 0.6 (April 2013)
-========================
+------------------------
 
    * ~2100 changes, numerous bugfixes
 
@@ -1412,9 +1404,8 @@ Version 0.6 (April 2013)
       * Rust code may be embedded in foreign code under limited circumstances
       * Inline assembler supported by new asm!() syntax extension.
 
-
 Version 0.5 (December 2012)
-===========================
+---------------------------
 
    * ~900 changes, numerous bugfixes
 
@@ -1469,9 +1460,8 @@ Version 0.5 (December 2012)
       * Added a preliminary REPL, `rusti`
       * License changed from MIT to dual MIT/APL2
 
-
 Version 0.4 (October 2012)
-==========================
+--------------------------
 
    * ~2000 changes, numerous bugfixes
 
@@ -1525,9 +1515,8 @@ Version 0.4 (October 2012)
         Rust-based (visitor) code
       * All hash functions and tables converted to secure, randomized SipHash
 
-
 Version 0.3  (July 2012)
-========================
+------------------------
 
    * ~1900 changes, numerous bugfixes
 
@@ -1584,9 +1573,8 @@ Version 0.3  (July 2012)
    * Tool improvements
       * Cargo automatically resolves dependencies
 
-
 Version 0.2  (March 2012)
-=========================
+-------------------------
 
    * >1500 changes, numerous bugfixes
 
@@ -1625,9 +1613,8 @@ Version 0.2  (March 2012)
       * Merged per-platform std::{os*, fs*} to core::{libc, os}
       * Extensive cleanup, regularization in libstd, libcore
 
-
 Version 0.1  (January 20, 2012)
-===============================
+-------------------------------
 
    * Most language features work, including:
       * Unique pointers, unique closures, move semantics

trunk/src/doc/trpl/borrow-and-asref.md

@@ -47,11 +47,11 @@ This is because the standard library has `impl Borrow<str> for String`.
 
 For most types, when you want to take an owned or borrowed type, a `&T` is
 enough. But one area where `Borrow` is effective is when there’s more than one
-kind of borrowed value. This is especially true of references and slices: you
-can have both an `&T` or a `&mut T`. If we wanted to accept both of these types,
-`Borrow` is up for it:
+kind of borrowed value. Slices are an area where this is especially true: you
+can have both an `&[T]` or a `&mut [T]`. If we wanted to accept both of these
+types, `Borrow` is up for it:
 
-```
+```rust
 use std::borrow::Borrow;
 use std::fmt::Display;
 

trunk/src/doc/trpl/box-syntax-and-patterns.md

@@ -5,7 +5,7 @@ Also it is not possible in stable Rust to destructure a `Box` in a match
 pattern. The unstable `box` keyword can be used to both create and destructure
 a `Box`. An example usage would be:
 
-```
+```rust
 #![feature(box_syntax, box_patterns)]
 
 fn main() {

trunk/src/doc/trpl/concurrency.md

@@ -59,7 +59,7 @@ place!
 Rust's standard library provides a library for threads, which allow you to
 run Rust code in parallel. Here's a basic example of using `std::thread`:
 
-```
+```rust
 use std::thread;
 
 fn main() {
@@ -73,7 +73,7 @@ The `thread::spawn()` method accepts a closure, which is executed in a
 new thread. It returns a handle to the thread, that can be used to
 wait for the child thread to finish and extract its result:
 
-```
+```rust
 use std::thread;
 
 fn main() {
@@ -189,7 +189,7 @@ guard across thread boundaries, which gives us our error.
 
 We can use `Arc<T>` to fix this. Here's the working version:
 
-```
+```rust
 use std::sync::{Arc, Mutex};
 use std::thread;
 
@@ -248,7 +248,7 @@ threads with each other. Let's talk about one of them: channels.
 Here's a version of our code that uses channels for synchronization, rather
 than waiting for a specific time:
 
-```
+```rust
 use std::sync::{Arc, Mutex};
 use std::thread;
 use std::sync::mpsc;
@@ -281,7 +281,7 @@ a simple `()` down the channel, and then wait for ten of them to come back.
 While this channel is just sending a generic signal, we can send any data that
 is `Send` over the channel!
 
-```
+```rust
 use std::thread;
 use std::sync::mpsc;
 
@@ -311,7 +311,7 @@ the answer, and then it `send()`s us the answer over the channel.
 A `panic!` will crash the currently executing thread. You can use Rust's
 threads as a simple isolation mechanism:
 
-```
+```rust
 use std::thread;
 
 let result = thread::spawn(move || {

trunk/src/doc/trpl/crates-and-modules.md

@@ -75,7 +75,7 @@ above.
 To define each of our modules, we use the `mod` keyword. Let’s make our
 `src/lib.rs` look like this:
 
-```
+```rust
 mod english {
     mod greetings {
     }

trunk/src/doc/trpl/dining-philosophers.md

@@ -18,7 +18,7 @@ called ‘the dining philosophers’. It was originally conceived by Dijkstra in
 > in his own chair, picked up his own fork on his left, and plunged it into the
 > spaghetti. But such is the tangled nature of spaghetti that a second fork is
 > required to carry it to the mouth. The philosopher therefore had also to pick
-> up the fork on his right. When he was finished he would put down both his
+> up the fork on his right. When we was finished he would put down both his
 > forks, get up from his chair, and continue thinking. Of course, a fork can be
 > used by only one philosopher at a time. If the other philosopher wants it, he
 > just has to wait until the fork is available again.