---

yaml
---
r: 148895
b: refs/heads/try2
c: acb1ec0
h: refs/heads/master
i:
  148893: 7027b44
  148891: 93fbaf8
  148887: bbe48da
  148879: 04749ec
  148863: 8e5fac5
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4f462a05066ea4ddbe65d3033402e7c80247ddde
+refs/heads/try2: acb1ec0b6715a529e3f6a7053737d99f03971c27
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitignore

@@ -71,14 +71,7 @@ src/.DS_Store
 /stage2/
 /stage3/
 *.bz2
-/doc/html
-/doc/latex
-/doc/std
-/doc/extra
-/doc/green
-/doc/native
-/doc/rustc
-/doc/syntax
+/doc
 /nd/
 /llvm/
 version.md
@@ -95,3 +88,4 @@ src/etc/dl
 build/
 i686-pc-mingw32/
 src/librustc/lib/llvmdeps.rs
+*.pot

branches/try2/.gitmodules

@@ -1,11 +1,11 @@
 [submodule "src/llvm"]
 	path = src/llvm
-	url = https://github.com/luqmana/llvm.git
+	url = https://github.com/rust-lang/llvm.git
 	branch = master
 [submodule "src/libuv"]
 	path = src/libuv
-	url = https://github.com/alexcrichton/libuv.git
+	url = https://github.com/rust-lang/libuv.git
 	branch = master
 [submodule "src/gyp"]
 	path = src/gyp
-	url = https://github.com/alexcrichton/gyp.git
+	url = https://github.com/rust-lang/gyp.git

branches/try2/AUTHORS.txt

@@ -1,16 +1,23 @@
+Rust was written by these fine people:
+
 Aaron Laursen <[email protected]>
 Aaron Todd <[email protected]>
 Adam Bozanich <[email protected]>
 Adrien Tétar <[email protected]>
+Alan Andrade <[email protected]>
 Aleksander Balicki <[email protected]>
 Alex Crichton <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Alexander Stavonin <[email protected]>
+Alexandros Tasos <[email protected]>
 Alexei Sholik <[email protected]>
 Aljaž "g5pw" Srebrnič <[email protected]>
 Anders Kaseorg <[email protected]>
 Andreas Gal <[email protected]>
 Andreas Martens <[email protected]>
+Andreas Neuhaus <[email protected]>
+Andreas Ots <[email protected]>
+Andrei Formiga <[email protected]>
 Andrew Dunham <[email protected]>
 Andrew Paseltiner <[email protected]>
 Anthony Juckel <[email protected]>
@@ -41,17 +48,25 @@ Brandon Sanderson <[email protected]>
 Brendan Cully <[email protected]>
 Brendan Eich <[email protected]>
 Brendan Zabarauskas <[email protected]>
+Branimir <[email protected]>
 Brett Cannon <[email protected]>
 Brian Anderson <[email protected]>
+Brian Dawn <[email protected]>
 Brian J. Burg <[email protected]>
 Brian Leibig <[email protected]>
 Bryan Dunsmore <[email protected]>
+Cadence Marseille <[email protected]>
 Caitlin Potter <[email protected]>
+Carl-Anton Ingmarsson <[email protected]>
 Carlos <[email protected]>
+Carol Willing <[email protected]>
+Carter Tazio Schonwald <[email protected]>
+chitra
 Chris Double <[email protected]>
 Chris Morgan <[email protected]>
 Chris Peterson <[email protected]>
 Chris Pressey <[email protected]>
+Chris Sainty <[email protected]>
 Cody Schroeder <[email protected]>
 Corey Richardson <[email protected]>
 Damian Gryski <[email protected]>
@@ -69,40 +84,56 @@ Daniel Rosenwasser <[email protected]>
 Daniel Ursache Dogariu <[email protected]>
 darkf <[email protected]>
 Dave Herman <[email protected]>
+Dave Hodder <[email protected]>
 David Creswick <[email protected]>
 David Forsythe <[email protected]>
 David Halperin <[email protected]>
 David Klein <[email protected]>
 David Manescu <[email protected]>
 David Rajchenbach-Teller <[email protected]>
+David Renshaw <[email protected]>
+Diego Ongaro <[email protected]>
 Diggory Hardy <[email protected]>
 Dimitri Krassovski <[email protected]>
+Dirkjan Bussink <[email protected]>
 Dmitry Ermolov <[email protected]>
 Do Nhat Minh <[email protected]>
 Donovan Preston <[email protected]>
 Drew Willcoxon <[email protected]>
+Eduard Burtescu <[email protected]>
+Edward Z. Yang <[email protected]>
+eliovir <[email protected]>
 Elliott Slaughter <[email protected]>
 Elly Fong-Jones <[email protected]>
+Eric Biggers <[email protected]>
 Eric Holk <[email protected]>
 Eric Holmes <[email protected]>
+Erik Lyon <[email protected]>
 Eric Martin <[email protected]>
 Eric Reed <[email protected]>
 Erick Tryzelaar <[email protected]>
+Erik Price <[email protected]>
 Erik Rose <[email protected]>
 Etienne Millon <[email protected]>
 Evan McClanahan <[email protected]>
+Fabrice Desré <[email protected]>
 Fedor Indutny <[email protected]>
 Felix S. Klock II <[email protected]>
 Flaper Fesp <[email protected]>
 Flavio Percoco <[email protected]>
+flo-l <[email protected]>
+Florian Gilcher <[email protected]>
 Florian Hahn <[email protected]>
 Florian Zeitz <[email protected]>
 Francisco Souza <[email protected]>
 Franklin Chen <[email protected]>
+g3xzh <[email protected]>
 Gábor Horváth <[email protected]>
 Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
 Gary Linscott <[email protected]>
+Geoff Hill <[email protected]>
+Geoffroy Couprie <[email protected]>
 Georges Dubus <[email protected]>
 gifnksm <[email protected]>
 Glenn Willen <[email protected]>
@@ -111,23 +142,35 @@ Graham Fawcett <[email protected]>
 Grahame Bowland <[email protected]>
 Graydon Hoare <[email protected]>
 Grigoriy <[email protected]>
+Guillaume Pinot <[email protected]>
+Gyorgy Andrasek <[email protected]>
 Haitao Li <[email protected]>
 hansjorg <[email protected]>
+Harry Marr <[email protected]>
+Heather <[email protected]>
 Herman J. Radtke III <[email protected]>
 Huon Wilson <[email protected]>
 Ian D. Bollinger <[email protected]>
+Ian Daniher <[email protected]>
+Igor Bukanov <[email protected]>
 Ilyong Cho <[email protected]>
 Isaac Aggrey <[email protected]>
+Isaac Dupree <[email protected]>
 Ivano Coppola <[email protected]>
 Jack Moffitt <[email protected]>
 Jacob Harris Cryer Kragh <[email protected]>
 Jacob Parker <[email protected]>
+Jaemin Moon <[email protected]>
 Jakub <[email protected]>
 Jakub Wieczorek <[email protected]>
 James Miller <[email protected]>
 James Tranovich <[email protected]>
 Jan Kobler <[email protected]>
+Jan Niklas Hasse <[email protected]>
+Jannis Harder <[email protected]>
 Jason Orendorff <[email protected]>
+Jason Toffaletti <[email protected]>
+Jay Anderson <[email protected]>
 Jed Davis <[email protected]>
 Jeff Balogh <[email protected]>
 Jeff Muizelaar <[email protected]>
@@ -145,14 +188,18 @@ Jimmy Zelinskie <[email protected]>
 J. J. Weber <[email protected]>
 jmgrosen <[email protected]>
 Joe Pletcher <[email protected]>
+Joe Schafer <[email protected]>
 John Barker <[email protected]>
 John Clements <[email protected]>
+John Louis Walker <[email protected]>
 Jon Morton <[email protected]>
 Jonathan Sternberg <[email protected]>
 Jordi Boggiano <[email protected]>
 Josh Matthews <[email protected]>
 Joshua Clark <[email protected]>
 Joshua Wise <[email protected]>
+Joshua Yanovski <[email protected]>
+Julia Evans <[email protected]>
 Junyoung Cho <[email protected]>
 Jyun-Yan You <[email protected]>
 Kang Seonghoon <[email protected]>
@@ -163,31 +210,39 @@ Kevin Ballard <[email protected]>
 Kevin Cantu <[email protected]>
 Kevin Mehall <[email protected]>
 Kevin Murphy <[email protected]>
+Kiet Tran <[email protected]>
 klutzy <[email protected]>
 korenchkin <[email protected]>
 Kyeongwoon Lee <[email protected]>
 Lars Bergstrom <[email protected]>
 Laurent Bonnans <[email protected]>
 Lawrence Velázquez <[email protected]>
 Leah Hanson <[email protected]>
+Lee Wondong <[email protected]>
+Léo Testard <[email protected]>
 Lennart Kudling <[email protected]>
 Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
 Luis de Bethencourt <[email protected]>
 Luqman Aden <[email protected]>
+lyuts <[email protected]>
 Magnus Auvinen <[email protected]>
 Mahmut Bulut <[email protected]>
 maikklein <[email protected]>
 Makoto Nakashima <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
 Mark Lacey <[email protected]>
+Mark Rowe <[email protected]>
 Mark Sinclair <[email protected]>
 Mark Vian <[email protected]>
 Marti Raudsepp <[email protected]>
 Martin DeMello <[email protected]>
 Marvin Löbel <[email protected]>
 Matt Brubeck <[email protected]>
+Matt Carberry <[email protected]>
+Matthew Auld <[email protected]>
+Matthew Iselin <[email protected]>
 Matthew McPherrin <[email protected]>
 Matthew O'Connor <[email protected]>
 Matthijs Hofstra <[email protected]>
@@ -196,19 +251,24 @@ Maxim Kolganov <[email protected]>
 Micah Chalmer <[email protected]>
 Michael Arntzenius <[email protected]>
 Michael Bebenita <[email protected]>
+Michael Letterle <[email protected]>
 Michael Neumann <[email protected]>
 Michael Sullivan <[email protected]>
+Michael Williams <[email protected]>
 Michael Woerister <michaelwoerister@gmail>
 Mihnea Dobrescu-Balaur <[email protected]>
 Mikko Perttunen <[email protected]>
 Mukilan Thiagarajan <[email protected]>
 Nick Desaulniers <[email protected]>
+Nif Ward <[email protected]>
 Niko Matsakis <[email protected]>
+Noufal Ibrahim <[email protected]>
 novalis <[email protected]>
 Ogino Masanori <[email protected]>
 Olivier Saut <[email protected]>
 Or Brostovski <[email protected]>
 Orphée Lafond-Lummis <[email protected]>
+osa1 <[email protected]>
 Palmer Cox <[email protected]>
 Patrick Walton <[email protected]>
 Patrik Kårlin <[email protected]>
@@ -218,15 +278,21 @@ Paul Woolcock <[email protected]>
 Pavel Panchekha <[email protected]>
 Peter Hull <[email protected]>
 Peter Williams <[email protected]>
+Peter Zotov <[email protected]>
 Philipp Brüschweiler <[email protected]>
+Pradeep Kumar <[email protected]>
 Rafael Ávila de Espíndola <[email protected]>
 Ralph Bodenner <[email protected]>
 Ralph Giles <[email protected]>
 Ramkumar Ramachandra <[email protected]>
+Raphael Speyer <[email protected]>
+reedlepee <[email protected]>
 Reuben Morais <[email protected]>
+Richard Diamond <[email protected]>
 Rick Waldron <[email protected]>
 Rob Arnold <[email protected]>
 Rob Hoelz <[email protected]>
+Robert Irelan <[email protected]>
 Robert Knight <[email protected]>
 Robert Millar <[email protected]>
 Roland Tanglao <[email protected]>
@@ -242,9 +308,12 @@ Scott Lawrence <[email protected]>
 Sean Moon <[email protected]>
 Sean Stangl <[email protected]>
 Sebastian N. Fernandez <[email protected]>
+Sébastien Chauvel <[email protected]>
 Sébastien Crozet <[email protected]>
+Sébastien Paolacci <[email protected]>
 Seth Pink <[email protected]>
 Seo Sanghyeon <[email protected]>
+Seonghyun Kim <[email protected]>
 sevrak <[email protected]>
 SiegeLord <[email protected]>
 Simon Barber-Dueck <[email protected]>
@@ -257,6 +326,7 @@ Steve Klabnik <[email protected]>
 Steven De Coeyer <[email protected]>
 Steven Fackler <[email protected]>
 Steven Stewart-Gallus <[email protected]>
+Strahinja Val Markovic <[email protected]>
 Taras Shpot <[email protected]>
 Ted Horst <[email protected]>
 Thad Guidry <[email protected]>
@@ -265,6 +335,7 @@ Tim Chevalier <[email protected]>
 Tim Kuehn <[email protected]>
 Tim Taubert <[email protected]>
 Tom Lee <[email protected]>
+Tomas Sedovic <[email protected]>
 Tommy M. McGuire <[email protected]>
 Tomoki Aonuma <[email protected]>
 Tony Young <[email protected]>
@@ -274,15 +345,19 @@ Tyler Bindon <[email protected]>
 U-NOV2010\eugals
 Uwe Dauernheim <[email protected]>
 Vadim Chugunov <[email protected]>
+Vijay Korapaty <[email protected]>
 Viktor Dahl <[email protected]>
 Vincent Belliard <[email protected]>
 Vivek Galatage <[email protected]>
+Volker Mische <[email protected]>
 Wade Mealing <[email protected]>
-William Ting <william.h.ting@gmail.com>
+William Ting <io@williamting.com>
 Yasuhiro Fujii <[email protected]>
 Young-il Choi <[email protected]>
 Youngmin Yoo <[email protected]>
 Youngsoo Son <[email protected]>
+Zach Kamsler <[email protected]>
 Zack Corr <[email protected]>
 Zack Slayton <[email protected]>
+Ziad Hatahet <[email protected]>
 zofrex <[email protected]>

branches/try2/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 If you're just reporting a bug, please see:
 
-https://github.com/mozilla/rust/wiki/HOWTO-submit-a-Rust-bug-report
+http://static.rust-lang.org/doc/master/complement-bugreport.html
 
 ## Pull request procedure
 

branches/try2/COPYRIGHT

@@ -6,7 +6,7 @@ terms.
 
 Longer version:
 
-The Rust Project is copyright 2013, The Rust Project
+The Rust Project is copyright 2014, The Rust Project
 Developers (given in the file AUTHORS.txt).
 
 Licensed under the Apache License, Version 2.0

branches/try2/LICENSE-MIT

@@ -1,5 +1,5 @@
 Copyright (c) 2006-2009 Graydon Hoare
-Copyright (c) 2009-2013 Mozilla Foundation
+Copyright (c) 2009-2014 Mozilla Foundation
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated