---

yaml
---
r: 83525
b: refs/heads/try
c: 76e8f08
h: refs/heads/master
i:
  83523: 8a6efc4
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: d8db96cbbfd54e2d0eaffcfb81d286c32900193d
+refs/heads/try: 76e8f0828ac1f4f0b13a4680e61c78c1b35c6a61
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/.gitattributes

@@ -4,6 +4,7 @@
 *.cpp rust
 *.h rust
 *.rs rust
+src/etc/pkg/rust-logo.ico binary
 src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
 src/rt/linenoise/* -whitespace

branches/try/AUTHORS.txt

@@ -1,23 +1,23 @@
-Initial author, project lead, target of blame:
-
-Graydon Hoare <[email protected]>
-
-Other authors:
-
-
+Aaron Laursen <[email protected]>
+Aaron Todd <[email protected]>
 Adam Bozanich <[email protected]>
+Adrien Tétar <[email protected]>
 Aleksander Balicki <[email protected]>
 Alex Crichton <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Alexander Stavonin <[email protected]>
 Alexei Sholik <[email protected]>
+Aljaž "g5pw" Srebrnič <[email protected]>
+Anders Kaseorg <[email protected]>
 Andreas Gal <[email protected]>
+Andreas Martens <[email protected]>
 Andrew Dunham <[email protected]>
 Andrew Paseltiner <[email protected]>
 Anthony Juckel <[email protected]>
 Arkaitz Jimenez <[email protected]>
 Armin Ronacher <[email protected]>
 Ashok Gautham <[email protected]>
+Austin King <[email protected]>
 Austin Seipp <[email protected]>
 Aydin Kim <[email protected]>
 auREAX <[email protected]>
@@ -33,7 +33,12 @@ Bilal Husain <[email protected]>
 Bill Fallon <[email protected]>
 Bill Myers <[email protected]>
 Bill Wendling <[email protected]>
+Birunthan Mohanathas <[email protected]>
 Björn Steinbrink <[email protected]>
+blake2-ppc <[email protected]>
+Bouke van der Bijl <[email protected]>
+Brandon Sanderson <[email protected]>
+Brendan Cully <[email protected]>
 Brendan Eich <[email protected]>
 Brendan Zabarauskas <[email protected]>
 Brett Cannon <[email protected]>
@@ -42,7 +47,9 @@ Brian J. Burg <[email protected]>
 Brian Leibig <[email protected]>
 Bryan Dunsmore <[email protected]>
 Caitlin Potter <[email protected]>
+Carlos <[email protected]>
 Chris Double <[email protected]>
+Chris Morgan <[email protected]>
 Chris Peterson <[email protected]>
 Chris Pressey <[email protected]>
 Cody Schroeder <[email protected]>
@@ -52,39 +59,58 @@ Damien Grassart <[email protected]>
 Damien Schoof <[email protected]>
 Daniel Brooks <[email protected]>
 Daniel Farina <[email protected]>
+Dan Connolly <[email protected]>
 Dan Luu <[email protected]>
 Daniel Luz <[email protected]>
 Daniel Micay <[email protected]>
 Daniel Patterson <[email protected]>
 Daniel Ralston <[email protected]>
+Daniel Rosenwasser <[email protected]>
 Daniel Ursache Dogariu <[email protected]>
+darkf <[email protected]>
 Dave Herman <[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]>
 Diggory Hardy <[email protected]>
 Dimitri Krassovski <[email protected]>
+Dmitry Ermolov <[email protected]>
+Do Nhat Minh <[email protected]>
 Donovan Preston <[email protected]>
 Drew Willcoxon <[email protected]>
 Elliott Slaughter <[email protected]>
 Elly Fong-Jones <[email protected]>
 Eric Holk <[email protected]>
 Eric Holmes <[email protected]>
+Eric Martin <[email protected]>
+Eric Reed <[email protected]>
 Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
+Etienne Millon <[email protected]>
 Evan McClanahan <[email protected]>
 Fedor Indutny <[email protected]>
 Felix S. Klock II <[email protected]>
+Flaper Fesp <[email protected]>
+Flavio Percoco <[email protected]>
+Florian Hahn <[email protected]>
+Florian Zeitz <[email protected]>
 Francisco Souza <[email protected]>
 Franklin Chen <[email protected]>
 Gábor Horváth <[email protected]>
 Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
+Gary Linscott <[email protected]>
+Georges Dubus <[email protected]>
 gifnksm <[email protected]>
 Glenn Willen <[email protected]>
 Gonçalo Cabrita <[email protected]>
 Graham Fawcett <[email protected]>
 Grahame Bowland <[email protected]>
+Graydon Hoare <[email protected]>
+Grigoriy <[email protected]>
 Haitao Li <[email protected]>
 hansjorg <[email protected]>
 Herman J. Radtke III <[email protected]>
@@ -96,9 +122,11 @@ Ivano Coppola <[email protected]>
 Jack Moffitt <[email protected]>
 Jacob Harris Cryer Kragh <[email protected]>
 Jacob Parker <[email protected]>
+Jakub <[email protected]>
 Jakub Wieczorek <[email protected]>
 James Miller <[email protected]>
 James Tranovich <[email protected]>
+Jan Kobler <[email protected]>
 Jason Orendorff <[email protected]>
 Jed Davis <[email protected]>
 Jeff Balogh <[email protected]>
@@ -113,35 +141,48 @@ Jesse Ruderman <[email protected]>
 Jihyun Yu <[email protected]>
 Jim Blandy <[email protected]>
 Jimmy Lu <[email protected]>
+Jimmy Zelinskie <[email protected]>
 J. J. Weber <[email protected]>
+jmgrosen <[email protected]>
 Joe Pletcher <[email protected]>
+John Barker <[email protected]>
 John Clements <[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]>
 Junyoung Cho <[email protected]>
 Jyun-Yan You <[email protected]>
 Kang Seonghoon <[email protected]>
+Keegan McAllister <[email protected]>
 Kelly Wilson <[email protected]>
 Kevin Atkinson <[email protected]>
 Kevin Ballard <[email protected]>
 Kevin Cantu <[email protected]>
+Kevin Mehall <[email protected]>
+Kevin Murphy <[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]>
 Lennart Kudling <[email protected]>
 Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
+Luis de Bethencourt <[email protected]>
 Luqman Aden <[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 Sinclair <[email protected]>
 Mark Vian <[email protected]>
 Marti Raudsepp <[email protected]>
 Martin DeMello <[email protected]>
@@ -151,18 +192,27 @@ Matthew McPherrin <[email protected]>
 Matthew O'Connor <[email protected]>
 Matthijs Hofstra <[email protected]>
 Max Penet <[email protected]>
+Maxim Kolganov <[email protected]>
+Micah Chalmer <[email protected]>
 Michael Arntzenius <[email protected]>
 Michael Bebenita <[email protected]>
 Michael Neumann <[email protected]>
 Michael Sullivan <[email protected]>
+Michael Woerister <michaelwoerister@gmail>
+Mihnea Dobrescu-Balaur <[email protected]>
 Mikko Perttunen <[email protected]>
+Mukilan Thiagarajan <[email protected]>
 Nick Desaulniers <[email protected]>
 Niko Matsakis <[email protected]>
+novalis <[email protected]>
+Ogino Masanori <[email protected]>
 Olivier Saut <[email protected]>
 Or Brostovski <[email protected]>
 Orphée Lafond-Lummis <[email protected]>
+Palmer Cox <[email protected]>
 Patrick Walton <[email protected]>
 Patrik Kårlin <[email protected]>
+Paul Collins <[email protected]>
 Paul Stansifer <[email protected]>
 Paul Woolcock <[email protected]>
 Pavel Panchekha <[email protected]>
@@ -177,25 +227,32 @@ Reuben Morais <[email protected]>
 Rick Waldron <[email protected]>
 Rob Arnold <[email protected]>
 Rob Hoelz <[email protected]>
+Robert Knight <[email protected]>
+Robert Millar <[email protected]>
 Roland Tanglao <[email protected]>
 Ron Dahlgren <[email protected]>
 Roy Frostig <[email protected]>
 Ryan Scheel <[email protected]>
 Samuel Chase <[email protected]>
 Sander Mathijs van Veen <[email protected]>
 Sangeun Kim <[email protected]>
+Sankha Narayan Guria <[email protected]>
 Saurabh Anand <[email protected]>
+Scott Lawrence <[email protected]>
 Sean Moon <[email protected]>
 Sean Stangl <[email protected]>
 Sebastian N. Fernandez <[email protected]>
+Sébastien Crozet <[email protected]>
 Seth Pink <[email protected]>
 Seo Sanghyeon <[email protected]>
 sevrak <[email protected]>
 SiegeLord <[email protected]>
 Simon Barber-Dueck <[email protected]>
 Simon Sapin <[email protected]>
+sp3d <sp3d@github>
 startling <[email protected]>
 Stefan Plantikow <[email protected]>
+Stepan Koltsov <[email protected]>
 Steve Klabnik <[email protected]>
 Steven De Coeyer <[email protected]>
 Steven Fackler <[email protected]>
@@ -205,6 +262,7 @@ Ted Horst <[email protected]>
 Thad Guidry <[email protected]>
 Thomas Daede <[email protected]>
 Tim Chevalier <[email protected]>
+Tim Kuehn <[email protected]>
 Tim Taubert <[email protected]>
 Tom Lee <[email protected]>
 Tommy M. McGuire <[email protected]>
@@ -213,6 +271,7 @@ Tony Young <[email protected]>
 Trinick <[email protected]>
 Tycho Sci <[email protected]>
 Tyler Bindon <[email protected]>
+U-NOV2010\eugals
 Uwe Dauernheim <[email protected]>
 Vadim Chugunov <[email protected]>
 Viktor Dahl <[email protected]>
@@ -225,4 +284,5 @@ Young-il Choi <[email protected]>
 Youngmin Yoo <[email protected]>
 Youngsoo Son <[email protected]>
 Zack Corr <[email protected]>
+Zack Slayton <[email protected]>
 zofrex <[email protected]>

branches/try/RELEASES.txt

@@ -1,7 +1,7 @@
-Version 0.8 (October 2013)
+Version 0.8 (September 2013)
 --------------------------
 
-   * ~2100 changes, numerous bugfixes
+   * ~2200 changes, numerous bugfixes
 
    * Language
       * The `for` loop syntax has changed to work with the `Iterator` trait.

branches/try/configure

@@ -684,7 +684,7 @@ do
       isaac linenoise sync test \
       arch/i386 arch/x86_64 arch/arm arch/mips  \
       libuv libuv/src/ares libuv/src/eio libuv/src/ev \
-      jemalloc
+      jemalloc sundown/src sundown/html
     do
       make_dir $t/rt/stage$s/$i
     done
@@ -848,6 +848,8 @@ do
         # Disable term-info, linkage of which comes in multiple forms,
         # making our snapshots incompatible (#9334)
         LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
+        # Try to have LLVM pull in as few dependencies as possible (#9397)
+        LLVM_OPTS="$LLVM_OPTS --disable-zlib --disable-libffi"
 
         case "$CFG_C_COMPILER" in
             ("ccache clang")

branches/try/doc/tutorial-rustpkg.md

@@ -7,7 +7,7 @@ package up your Rust code and share it with other people. This tutorial will
 get you started on all of the concepts and commands you need to give the gift
 of Rust code to someone else.
 
-## Installing External Packages
+# Installing External Packages
 
 First, let's try to use an external package somehow. I've made a sample package
 called `hello` to demonstrate how to do so.  Here's how `hello` is used:
@@ -68,7 +68,7 @@ Hello, world.
 
 Simple! That's all it takes.
 
-## Workspaces
+# Workspaces
 
 Before we can talk about how to make packages of your own, you have to
 understand the big concept with `rustpkg`: workspaces. A 'workspace' is simply
@@ -88,14 +88,14 @@ There are also default file names you'll want to follow as well:
 * `main.rs`: A file that's going to become an executable.
 * `lib.rs`: A file that's going to become a library.
 
-## Building your own Package
+# Building your own Package
 
 Now that you've got workspaces down, let's build your own copy of `hello`. Go
 to wherever you keep your personal projects, and let's make all of the
 directories we'll need. I'll refer to this personal project directory as
 `~/src` for the rest of this tutorial.
 
-### Creating our workspace
+## Creating our workspace
 
 ~~~ {.notrust}
 $ cd ~/src
@@ -150,15 +150,15 @@ pub fn world() {
 
 Put this into `src/hello/lib.rs`. Let's talk about each of these attributes:
 
-### Crate attributes for packages
+## Crate attributes for packages
 
 `license` is equally simple: the license we want this code to have. I chose MIT
 here, but you should pick whatever license makes the most sense for you.
 
 `desc` is a description of the package and what it does. This should just be a
 sentence or two.
 
-### Building your package
+## Building your package
 
 Building your package is simple:
 
@@ -206,7 +206,7 @@ note: Installed package github.com/YOUR_USERNAME/hello-0.1 to /home/yourusername
 
 That's it!
 
-## More resources
+# More resources
 
 There's a lot more going on with `rustpkg`, this is just to get you started.
 Check out [the rustpkg manual](rustpkg.html) for the full details on how to

branches/try/doc/tutorial-tasks.md

@@ -423,7 +423,7 @@ do_some_work();
 While it isn't possible for a task to recover from failure, tasks may notify
 each other of failure. The simplest way of handling task failure is with the
 `try` function, which is similar to `spawn`, but immediately blocks waiting
-for the child task to finish. `try` returns a value of type `Result<int,
+for the child task to finish. `try` returns a value of type `Result<T,
 ()>`. `Result` is an `enum` type with two variants: `Ok` and `Err`. In this
 case, because the type arguments to `Result` are `int` and `()`, callers can
 pattern-match on a result to check whether it's an `Ok` result with an `int`

branches/try/doc/tutorial.md

@@ -2995,7 +2995,7 @@ There is further documentation on the [wiki], however those tend to be even more
 [tasks]: tutorial-tasks.html
 [macros]: tutorial-macros.html
 [ffi]: tutorial-ffi.html
-[rustpkg]: rustpkg.html
+[rustpkg]: tutorial-rustpkg.html
 
 [wiki]: https://github.com/mozilla/rust/wiki/Docs
 

branches/try/mk/docs.mk

@@ -160,6 +160,16 @@ doc/tutorial-conditions.html: tutorial-conditions.md doc/version_info.html doc/r
            --include-before-body=doc/version_info.html \
            --output=$@
 
+DOCS += doc/tutorial-rustpkg.html
+doc/tutorial-rustpkg.html: tutorial-rustpkg.md doc/version_info.html doc/rust.css
+	@$(call E, pandoc: $@)
+	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
+          $(CFG_PANDOC) --standalone --toc \
+           --section-divs --number-sections \
+           --from=markdown --to=html --css=rust.css \
+           --include-before-body=doc/version_info.html \
+           --output=$@
+
   ifeq ($(CFG_PDFLATEX),)
     $(info cfg: no pdflatex found, omitting doc/rust.pdf)
   else