---

yaml
---
r: 214872
b: refs/heads/beta
c: 69a0e1a
h: refs/heads/master
v: v3

Author: sfackler

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: a0f028da07d313ad554623d5700dcbd16f3a4bde
+refs/heads/beta: 69a0e1af9553ad50ee2d9c9176470ddeef70717c
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/CONTRIBUTING.md

@@ -84,8 +84,7 @@ feature. We use the 'fork and pull' model described there.
 Please make pull requests against the `master` branch.
 
 All pull requests are reviewed by another person. We have a bot,
-@rust-highfive, that will automatically assign a random person to review your
-request.
+@rust-highfive, that will automatically assign a random person to review your request.
 
 If you want to request that a specific person reviews your pull request,
 you can add an `r?` to the message. For example, Steve usually reviews
@@ -125,10 +124,6 @@ To save @bors some work, and to get small changes through more quickly, when
 the other rollup-eligible patches too, and they'll get tested and merged at
 the same time.
 
-To find documentation-related issues, sort by the [A-docs label][adocs]. 
-
-[adocs]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AA-docs
-
 ## Issue Triage
 
 Sometimes, an issue will stay open, even though the bug has been fixed. And
@@ -137,40 +132,8 @@ meantime.
 
 It can be helpful to go through older bug reports and make sure that they are
 still valid. Load up an older issue, double check that it's still true, and
-leave a comment letting us know if it is or is not. The [least recently
-updated sort][lru] is good for finding issues like this.
-
-Contributors with sufficient permissions on the Rust repo can help by adding
-labels to triage issues:
-
-* Yellow, **A**-prefixed labels state which **area** of the project an issue
-  relates to. 
-
-* Magenta, **B**-prefixed labels identify bugs which **belong** elsewhere. 
-
-* Green, **E**-prefixed labels explain the level of **experience** necessary
-  to fix the issue.
-
-* Red, **I**-prefixed labels indicate the **importance** of the issue. The
-  [I-nominated][inom] label indicates that an issue has been nominated for
-  prioritizing at the next triage meeting. 
-
-* Orange, **P**-prefixed labels indicate a bug's **priority**. These labels
-  are only assigned during triage meetings, and replace the [I-nominated][inom]
-  label. 
-
-* Blue, **T**-prefixed bugs denote which **team** the issue belongs to.
-
-* Dark blue, **beta-** labels track changes which need to be backported into
-  the beta branches. 
- 
-* The purple **metabug** label marks lists of bugs collected by other
-  categories.  
-
-If you're looking for somewhere to start, check out the [E-easy][eeasy] tag. 
+leave a comment letting us know if it is or is not. The [least recently updated sort][lru] is good for finding issues like this.
 
-[inom]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AI-nominated
-[eeasy]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy
 [lru]: https://github.com/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc
 
 ## Out-of-tree Contributions

branches/beta/src/doc/complement-design-faq.md

@@ -160,7 +160,7 @@ that all delimiters be balanced.
 ## `->` for function return type
 
 This is to make the language easier to parse for humans, especially in the face
-of higher-order functions. `fn foo<T>(f: fn(i32): i32, fn(T): U): U` is not
+of higher-order functions. `fn foo<T>(f: fn(int): int, fn(T): U): U` is not
 particularly easy to read.
 
 ## Why is `let` used to introduce variables?

branches/beta/src/doc/reference.md

@@ -3255,8 +3255,8 @@ User-defined types have limited capabilities.
 The primitive types are the following:
 
 * The boolean type `bool` with values `true` and `false`.
-* The machine types (integer and floating-point).
-* The machine-dependent integer types.
+* The machine types.
+* The machine-dependent integer and floating-point types.
 
 #### Machine types
 

branches/beta/src/doc/style/errors/ergonomics.md

@@ -14,8 +14,8 @@ use std::io::{File, Open, Write, IoError};
 
 struct Info {
     name: String,
-    age: i32,
-    rating: i32
+    age: int,
+    rating: int
 }
 
 fn write_info(info: &Info) -> Result<(), IoError> {
@@ -36,8 +36,8 @@ use std::io::{File, Open, Write, IoError};
 
 struct Info {
     name: String,
-    age: i32,
-    rating: i32
+    age: int,
+    rating: int
 }
 
 fn write_info(info: &Info) -> Result<(), IoError> {
@@ -63,4 +63,4 @@ for more details.
 ### The `Result`-`impl` pattern [FIXME]
 
 > **[FIXME]** Document the way that the `io` module uses trait impls
-> on `std::io::Result` to painlessly propagate errors.
+> on `IoResult` to painlessly propagate errors.

branches/beta/src/doc/style/features/functions-and-methods/README.md

@@ -20,7 +20,6 @@ for any operation that is clearly associated with a particular
 type.
 
 Methods have numerous advantages over functions:
-
 * They do not need to be imported or qualified to be used: all you
   need is a value of the appropriate type.
 * Their invocation performs autoborrowing (including mutable borrows).

branches/beta/src/doc/style/features/functions-and-methods/input.md

@@ -57,15 +57,15 @@ it becomes.
 Prefer
 
 ```rust
-fn foo<T: Iterator<i32>>(c: T) { ... }
+fn foo<T: Iterator<int>>(c: T) { ... }
 ```
 
 over any of
 
 ```rust
-fn foo(c: &[i32]) { ... }
-fn foo(c: &Vec<i32>) { ... }
-fn foo(c: &SomeOtherCollection<i32>) { ... }
+fn foo(c: &[int]) { ... }
+fn foo(c: &Vec<int>) { ... }
+fn foo(c: &SomeOtherCollection<int>) { ... }
 ```
 
 if the function only needs to iterate over the data.
@@ -121,7 +121,7 @@ The primary exception: sometimes a function is meant to modify data
 that the caller already owns, for example to re-use a buffer:
 
 ```rust
-fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize>
+fn read(&mut self, buf: &mut [u8]) -> IoResult<uint>
 ```
 
 (From the [Reader trait](http://static.rust-lang.org/doc/master/std/io/trait.Reader.html#tymethod.read).)
@@ -159,7 +159,7 @@ fn foo(a: u8) { ... }
 Note that
 [`ascii::Ascii`](http://static.rust-lang.org/doc/master/std/ascii/struct.Ascii.html)
 is a _wrapper_ around `u8` that guarantees the highest bit is zero; see
-[newtype patterns](../types/newtype.md) for more details on creating typesafe wrappers.
+[newtype patterns]() for more details on creating typesafe wrappers.
 
 Static enforcement usually comes at little run-time cost: it pushes the
 costs to the boundaries (e.g. when a `u8` is first converted into an

branches/beta/src/doc/style/features/functions-and-methods/output.md

@@ -19,15 +19,15 @@ Prefer
 ```rust
 struct SearchResult {
     found: bool,          // item in container?
-    expected_index: usize // what would the item's index be?
+    expected_index: uint  // what would the item's index be?
 }
 
 fn binary_search(&self, k: Key) -> SearchResult
 ```
 or
 
 ```rust
-fn binary_search(&self, k: Key) -> (bool, usize)
+fn binary_search(&self, k: Key) -> (bool, uint)
 ```
 
 over

branches/beta/src/doc/style/features/let.md

@@ -5,7 +5,7 @@
 Prefer
 
 ```rust
-fn use_mutex(m: sync::mutex::Mutex<i32>) {
+fn use_mutex(m: sync::mutex::Mutex<int>) {
     let guard = m.lock();
     do_work(guard);
     drop(guard); // unlock the lock
@@ -16,7 +16,7 @@ fn use_mutex(m: sync::mutex::Mutex<i32>) {
 over
 
 ```rust
-fn use_mutex(m: sync::mutex::Mutex<i32>) {
+fn use_mutex(m: sync::mutex::Mutex<int>) {
     do_work(m.lock());
     // do other work
 }
@@ -34,7 +34,7 @@ Prefer
 
 ```rust
 let foo = match bar {
-    Baz => 0,
+    Baz  => 0,
     Quux => 1
 };
 ```
@@ -44,7 +44,7 @@ over
 ```rust
 let foo;
 match bar {
-    Baz => {
+    Baz  => {
         foo = 0;
     }
     Quux => {
@@ -61,8 +61,8 @@ conditional expression.
 Prefer
 
 ```rust
-let v = s.iter().map(|x| x * 2)
-                .collect::<Vec<_>>();
+s.iter().map(|x| x * 2)
+        .collect::<Vec<_>>()
 ```
 
 over

branches/beta/src/doc/style/features/traits/reuse.md

@@ -15,7 +15,7 @@ trait Printable {
     fn print(&self) { println!("{:?}", *self) }
 }
 
-impl Printable for i32 {}
+impl Printable for int {}
 
 impl Printable for String {
     fn print(&self) { println!("{}", *self) }

branches/beta/src/doc/style/features/types/newtype.md

@@ -43,12 +43,12 @@ promises to the client.
 
 For example, consider a function `my_transform` that returns a compound iterator
 type `Enumerate<Skip<vec::MoveItems<T>>>`. We wish to hide this type from the
-client, so that the client's view of the return type is roughly `Iterator<(usize,
+client, so that the client's view of the return type is roughly `Iterator<(uint,
 T)>`. We can do so using the newtype pattern:
 
 ```rust
 struct MyTransformResult<T>(Enumerate<Skip<vec::MoveItems<T>>>);
-impl<T> Iterator<(usize, T)> for MyTransformResult<T> { ... }
+impl<T> Iterator<(uint, T)> for MyTransformResult<T> { ... }
 
 fn my_transform<T, Iter: Iterator<T>>(iter: Iter) -> MyTransformResult<T> {
     ...

branches/beta/src/doc/style/ownership/builders.md

@@ -16,7 +16,7 @@ If `T` is such a data structure, consider introducing a `T` _builder_:
    value. When possible, choose a better name: e.g. `Command` is the builder for
    `Process`.
 2. The builder constructor should take as parameters only the data _required_ to
-   make a `T`.
+   to make a `T`.
 3. The builder should offer a suite of convenient methods for configuration,
    including setting up compound inputs (like slices) incrementally.
    These methods should return `self` to allow chaining.
@@ -75,7 +75,7 @@ impl Command {
     }
 
     /// Executes the command as a child process, which is returned.
-    pub fn spawn(&self) -> std::io::Result<Process> {
+    pub fn spawn(&self) -> IoResult<Process> {
         ...
     }
 }

branches/beta/src/doc/style/style/features.md

@@ -3,7 +3,7 @@
 Terminate `return` statements with semicolons:
 
 ``` rust
-fn foo(bar: i32) -> Option<i32> {
+fn foo(bar: int) -> Option<int> {
     if some_condition() {
         return None;
     }

branches/beta/src/doc/style/style/imports.md

@@ -44,7 +44,7 @@ For example:
 use option::Option;
 use mem;
 
-let i: isize = mem::transmute(Option(0));
+let i: int = mem::transmute(Option(0));
 ```
 
 > **[FIXME]** Add rationale.

branches/beta/src/doc/style/style/whitespace.md

@@ -10,7 +10,7 @@
 
 ``` rust
 #[deprecated = "Use `bar` instead."]
-fn foo(a: usize, b: usize) -> usize {
+fn foo(a: uint, b: uint) -> uint {
     a + b
 }
 ```

branches/beta/src/doc/trpl/README.md

@@ -15,7 +15,7 @@ language would.
 
 [rust]: http://rust-lang.org
 
-“The Rust Programming Language” is split into eight sections. This introduction
+“The Rust Programming Language” is split into seven sections. This introduction
 is the first. After this:
 
 * [Getting started][gs] - Set up your computer for Rust development.

branches/beta/src/doc/trpl/associated-types.md

@@ -43,7 +43,7 @@ trait Graph {
 Now, our clients can be abstract over a given `Graph`:
 
 ```rust,ignore
-fn distance<G: Graph>(graph: &G, start: &G::N, end: &G::N) -> usize { ... }
+fn distance<G: Graph>(graph: &G, start: &G::N, end: &G::N) -> uint { ... }
 ```
 
 No need to deal with the `E`dge type here!

branches/beta/src/doc/trpl/box-syntax-and-patterns.md

@@ -58,7 +58,7 @@ fn main() {
 ```
 
 The idea is that by passing around a box, you're only copying a pointer, rather
-than the hundred `i32`s that make up the `BigStruct`.
+than the hundred `int`s that make up the `BigStruct`.
 
 This is an antipattern in Rust. Instead, write this:
 

branches/beta/src/doc/trpl/conditional-compilation.md

@@ -34,7 +34,7 @@ These can nest arbitrarily:
 As for how to enable or disable these switches, if you’re using Cargo,
 they get set in the [`[features]` section][features] of your `Cargo.toml`:
 
-[features]: http://doc.crates.io/manifest.html#the-%5Bfeatures%5D-section
+[features]: http://doc.crates.io/manifest.html#the-[features]-section
 
 ```toml
 [features]

branches/beta/src/doc/trpl/glossary.md

@@ -19,7 +19,7 @@ In the example above `x` and `y` have arity 2. `z` has arity 3.
 
 When a compiler is compiling your program, it does a number of different
 things. One of the things that it does is turn the text of your program into an
-‘abstract syntax tree’, or ‘AST’. This tree is a representation of the
+‘abstract syntax tree’, or‘AST’. This tree is a representation of the
 structure of your program. For example, `2 + 3` can be turned into a tree:
 
 ```text

branches/beta/src/doc/trpl/lifetimes.md

@@ -137,27 +137,6 @@ x: &'a i32,
 uses it. So why do we need a lifetime here? We need to ensure that any reference
 to a `Foo` cannot outlive the reference to an `i32` it contains.
 
-If you have multiple references, you can use the same lifetime multiple times:
-
-```rust
-fn x_or_y<'a>(x: &'a str, y: &'a str) -> &'a str {
-#    x
-# }
-```
-
-This says that `x` and `y` both are alive for the same scope, and that the
-return value is also alive for that scope. If you wanted `x` and `y` to have
-different lifetimes, you can use multiple lifetime parameters:
-
-```rust
-fn x_or_y<'a, 'b>(x: &'a str, y: &'b str) -> &'a str {
-#    x
-# }
-```
-
-In this example, `x` and `y` have different valid scopes, but the return value
-has the same lifetime as `x`.
-
 ## Thinking in scopes
 
 A way to think about lifetimes is to visualize the scope that a reference is

branches/beta/src/doc/trpl/method-syntax.md

@@ -4,7 +4,7 @@ Functions are great, but if you want to call a bunch of them on some data, it
 can be awkward. Consider this code:
 
 ```rust,ignore
-baz(bar(foo));
+baz(bar(foo)));
 ```
 
 We would read this left-to right, and so we see ‘baz bar foo’. But this isn’t the

branches/beta/src/doc/trpl/references-and-borrowing.md

@@ -206,7 +206,7 @@ fn main() {
 ^
 ```
 
-In other words, the mutable borrow is held through the rest of our example. What
+In other words, the mutable borow is held through the rest of our example. What
 we want is for the mutable borrow to end _before_ we try to call `println!` and
 make an immutable borrow. In Rust, borrowing is tied to the scope that the
 borrow is valid for. And our scopes look like this: