---

yaml
---
r: 152830
b: refs/heads/try2
c: e3050ff
h: refs/heads/master
v: v3

Author: Zooko Wilcox-O'Hearn

[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: 7a93beef7f692b34168ad69633f56483d38ad8fc
+refs/heads/try2: e3050ffa526a1e4ada4f963ab11e1d3ea7802edb
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitignore

@@ -60,6 +60,7 @@ config.mk
 /rt/
 /rustllvm/
 /test/
+/build
 /inst/
 /mingw-build/
 src/.DS_Store
@@ -84,7 +85,7 @@ config.stamp
 .DS_Store
 src/etc/dl
 .settings/
-/build
+build/
 i686-pc-mingw32/
 src/librustc/lib/llvmdeps.rs
 *.pot

branches/try2/.travis.yml

@@ -27,8 +27,7 @@ before_script:
   - ln -nsf /usr/bin/llvm-dis-$LLVM_VERSION local-llvm/bin/llvm-dis
   - ln -nsf /usr/bin/llc-$LLVM_VERSION local-llvm/bin/llc
   - ln -nsf /usr/include/llvm-$LLVM_VERSION local-llvm/include
-  - ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm
-    --enable-fast-make --enable-clang
+  - ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm --enable-fast-make --enable-clang
 
 # Tidy everything up first, then build a few things, and then run a few tests.
 # Note that this is meant to run in a "fairly small" amount of time, so this
@@ -41,7 +40,7 @@ script: |
     if [[ $LLVM_VERSION != '3.4' ]]; then exit 0; fi
   fi &&
   make tidy &&
-  travis_wait make -j4 rustc-stage1 &&
+  make -j4 rustc-stage1 &&
   make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
 
 env:

branches/try2/AUTHORS.txt

@@ -3,7 +3,6 @@ Rust was written by these fine people:
 Aaron Laursen <aaronlaursen@gmail.com>
 Aaron Todd <github@opprobrio.us>
 Adam Bozanich <adam.boz@gmail.com>
-Adolfo Ochagavía <aochagavia92@gmail.com>
 Adrien Tétar <adri-from-59@hotmail.fr>
 Alan Andrade <alan.andradec@gmail.com>
 Aleksander Balicki <balicki.aleksander@gmail.com>
@@ -26,6 +25,7 @@ Andrew Chin <achin@eminence32.net>
 Andrew Dunham <andrew@du.nham.ca>
 Andrew Paseltiner <apaseltiner@gmail.com>
 Anthony Juckel <ajuckel@gmail.com>
+aochagavia <aochagavia92@gmail.com>
 Arcterus <Arcterus@mail.com>
 Arkaitz Jimenez <arkaitzj@gmail.com>
 Armin Ronacher <armin.ronacher@active-4.com>

branches/try2/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 If you're just reporting a bug, please see:
 
-http://doc.rust-lang.org/complement-bugreport.html
+http://static.rust-lang.org/doc/master/complement-bugreport.html
 
 ## Pull request procedure
 
@@ -20,13 +20,13 @@ please do two things:
 
 Pull requests will be treated as "review requests", and we will give
 feedback we expect to see corrected on
-[style](https://github.com/rust-lang/rust/wiki/Note-style-guide) and
+[style](https://github.com/mozilla/rust/wiki/Note-style-guide) and
 substance before pulling.  Changes contributed via pull request should
 focus on a single issue at a time, like any other.  We will not accept
 pull-requests that try to "sneak" unrelated changes in.
 
 Normally, all pull requests must include regression tests (see
-[Note-testsuite](https://github.com/rust-lang/rust/wiki/Note-testsuite))
+[Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite))
 that test your change.  Occasionally, a change will be very difficult
 to test for.  In those cases, please include a note in your commit
 message explaining why.
@@ -41,4 +41,4 @@ example, if it's 2014, and you change a Rust file that was created in
 ```
 
 For more details, please refer to
-[Note-development-policy](https://github.com/rust-lang/rust/wiki/Note-development-policy).
+[Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).

branches/try2/Makefile.in

@@ -68,7 +68,7 @@
 #
 #   * `TESTNAME=...` - Specify the name of tests to run
 #   * `CHECK_IGNORED=1` - Run normally-ignored tests
-#   * `PLEASE_BENCH=1` - Run crate benchmarks (enable `--bench` flag)
+#   * `NO_BENCH=1` - Don't run crate benchmarks (disable `--bench` flag)
 #
 #   * `CFG_ENABLE_VALGRIND=1` - Run tests under valgrind
 #   * `VALGRIND_COMPILE=1` - Run the compiler itself under valgrind
@@ -98,8 +98,8 @@
 # This is hardly all there is to know of The Rust Build System's
 # mysteries. The tale continues on the wiki[1][2].
 #
-# [1]: https://github.com/rust-lang/rust/wiki/Note-build-system
-# [2]: https://github.com/rust-lang/rust/wiki/Note-testsuite
+# [1]: https://github.com/mozilla/rust/wiki/Note-build-system
+# [2]: https://github.com/mozilla/rust/wiki/Note-testsuite
 #
 # If you really feel like getting your hands dirty, then:
 #

branches/try2/README.md

@@ -13,9 +13,9 @@ documentation.
 > [getting started][wiki-start] notes on the wiki.
 
 [installer]: http://www.rust-lang.org/install.html
-[tutorial]: http://doc.rust-lang.org/tutorial.html
-[wiki-start]: https://github.com/rust-lang/rust/wiki/Note-getting-started-developing-Rust
-[win-wiki]: https://github.com/rust-lang/rust/wiki/Using-Rust-on-Windows
+[tutorial]: http://static.rust-lang.org/doc/tutorial.html
+[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
+[win-wiki]: https://github.com/mozilla/rust/wiki/Using-Rust-on-Windows
 
 ## Building from Source
 
@@ -38,7 +38,7 @@ documentation.
 
     Or to build from the [repo] do:
 
-        $ git clone https://github.com/rust-lang/rust.git
+        $ git clone https://github.com/mozilla/rust.git
         $ cd rust
 
     Now that you have Rust's source code, you can configure and build it:
@@ -58,9 +58,9 @@ documentation.
 3. Read the [tutorial].
 4. Enjoy!
 
-[repo]: https://github.com/rust-lang/rust
+[repo]: https://github.com/mozilla/rust
 [tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
-[tutorial]: http://doc.rust-lang.org/tutorial.html
+[tutorial]: http://static.rust-lang.org/doc/master/tutorial.html
 
 ## Notes
 
@@ -83,7 +83,7 @@ swap, it will take a very long time to build.
 
 There is a lot more documentation in the [wiki].
 
-[wiki]: https://github.com/rust-lang/rust/wiki
+[wiki]: https://github.com/mozilla/rust/wiki
 
 ## License