---

yaml
---
r: 39668
b: refs/heads/incoming
c: d94e9c0
h: refs/heads/master
v: v3

Author: Mark Lacey

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: a933cdfbf16b7a45a61478ea25b89af43079631b
+refs/heads/incoming: d94e9c0b0483f8d8eaf5b0c7785368808fd5da1e
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/AUTHORS.txt

@@ -16,7 +16,6 @@ Arkaitz Jimenez <[email protected]>
 Armin Ronacher <[email protected]>
 Austin Seipp <[email protected]>
 auREAX <[email protected]>
-Ben Alpert <[email protected]>
 Ben Blum <[email protected]>
 Ben Striegel <[email protected]>
 Benjamin Herr <[email protected]>
@@ -50,7 +49,6 @@ Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
 Evan McClanahan <[email protected]>
 Francisco Souza <[email protected]>
-Franklin Chen <[email protected]>
 Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
 Glenn Willen <[email protected]>
@@ -108,7 +106,6 @@ Patrik Kårlin <[email protected]>
 Paul Stansifer <[email protected]>
 Paul Woolcock <[email protected]>
 Peter Hull <[email protected]>
-Peter Williams <[email protected]>
 Philipp Brüschweiler <[email protected]>
 Rafael Ávila de Espíndola <[email protected]>
 Ralph Giles <[email protected]>
@@ -122,7 +119,6 @@ Sean Stangl <[email protected]>
 Simon Barber-Dueck <[email protected]>
 startling <[email protected]>
 Stefan Plantikow <[email protected]>
-Steve Klabnik <[email protected]>
 Taras Shpot <[email protected]>
 Ted Horst <[email protected]>
 Tim Chevalier <[email protected]>

branches/incoming/CONTRIBUTING.md

@@ -65,11 +65,10 @@ API-documentation tool, and `cargo`, the Rust package manager.
 
 ## License
 
-Rust is primarily distributed under the terms of both the MIT license
-and the Apache License (Version 2.0), with portions covered by various
-BSD-like licenses.
+Rust is primarily distributed under the terms of the MIT license, with
+portions covered by various BSD-like licenses.
 
-See LICENSE-APACHE, LICENSE-MIT, and COPYRIGHT for details.
+See LICENSE.txt for details.
 
 ## More help
 

branches/incoming/README.md

@@ -1107,19 +1107,6 @@ let mut a: Animal = Dog;
 a = Cat;
 ~~~~
 
-Enumeration constructors can have either named or unnamed fields:
-~~~~
-enum Animal {
-    Dog (~str, float),
-    Cat { name: ~str, weight: float }
-}
-
-let mut a: Animal = Dog(~"Cocoa", 37.2);
-a = Cat{ name: ~"Spotty", weight: 2.7 };
-~~~~
-
-In this example, `Cat` is a _struct-like enum variant_,
-whereas `Dog` is simply called an enum variant.
 ### Constants
 
 ~~~~~~~~ {.ebnf .gram}
@@ -3258,12 +3245,12 @@ crate name the crate is given a default name that matches the source file,
 with the extension removed. In that case, to turn on logging for a program
 compiled from, e.g. `helloworld.rs`, `RUST_LOG` should be set to `helloworld`.
 
-As a convenience, the logging spec can also be set to a special pseudo-crate,
+As a convenience, the logging spec can also be set to a special psuedo-crate,
 `::help`. In this case, when the application starts, the runtime will
 simply output a list of loaded modules containing log expressions, then exit.
 
 The Rust runtime itself generates logging information. The runtime's logs are
-generated for a number of artificial modules in the `::rt` pseudo-crate,
+generated for a number of artificial modules in the `::rt` psuedo-crate,
 and can be enabled just like the logs for any standard module. The full list
 of runtime logging modules follows.
 
@@ -3341,7 +3328,7 @@ have come and gone during the course of Rust's development:
 
 * The Newsqueak (1988), Alef (1995), and Limbo (1996) family. These
   languages were developed by Rob Pike, Phil Winterbottom, Sean Dorward and
-  others in their group at Bell Labs Computing Sciences Research Center
+  others in their group at Bell labs Computing Sciences Research Center
   (Murray Hill, NJ, USA).
 
 * The Napier (1985) and Napier88 (1988) family. These languages were

branches/incoming/doc/rust.md

@@ -43,7 +43,7 @@ macro_rules! early_return(
             _ => {}
         }
     );
-)
+);
 // ...
 early_return!(input_1 special_a);
 // ...
@@ -160,7 +160,7 @@ macro_rules! early_return(
             _ => {}
         }
     );
-)
+);
 // ...
 early_return!(input_1, [special_a|special_c|special_d]);
 // ...