---

yaml
---
r: 160493
b: refs/heads/master
c: 8296808
h: refs/heads/master
i:
  160491: 114004b
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 75e4d9583832c158a9c0927cdb087e4555434993
+refs/heads/master: 829680840c1ef23439756ecc5fda16114026eed3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c9f6d696420107f82304b992cf623b806995fe18
 refs/heads/try: 225de0d60f8ca8dcc62ab2fd8818ebbda4b58cfe

trunk/.gitmodules

@@ -2,13 +2,6 @@
 	path = src/llvm
 	url = https://github.com/rust-lang/llvm.git
 	branch = master
-[submodule "src/libuv"]
-	path = src/libuv
-	url = https://github.com/rust-lang/libuv.git
-	branch = master
-[submodule "src/gyp"]
-	path = src/gyp
-	url = https://github.com/rust-lang/gyp.git
 [submodule "src/compiler-rt"]
 	path = src/compiler-rt
 	url = https://github.com/rust-lang/compiler-rt.git

trunk/.mailmap

@@ -5,8 +5,104 @@
 # email addresses.
 #
 
-Elly Jones <[email protected]>
-ILyoan <[email protected]>
+Aaron Todd <[email protected]>
+Ahmed Charles <[email protected]> <[email protected]>
+Alex Lyon <[email protected]> <[email protected]>
+Alex Rønne Petersen <[email protected]>
+Andreas Gal <[email protected]> <[email protected]>
+Andrew Poelstra <[email protected]> <[email protected]>
+Anton Löfgren <[email protected]> <[email protected]>
+Ariel Ben-Yehuda <[email protected]> <[email protected]>
+Austin Seipp <[email protected]> <[email protected]>
+Ben Alpert <[email protected]> <[email protected]>
+Benjamin Jackman <[email protected]>
+Björn Steinbrink <[email protected]> <[email protected]>
+blake2-ppc <[email protected]> <blake2-ppc>
+Boris Egorov <[email protected]> <[email protected]>
+Brian Anderson <[email protected]> <[email protected]>
+Brian Dawn <[email protected]>
+Carl-Anton Ingmarsson <[email protected]> <[email protected]>
+Carol Willing <[email protected]>
+Chris Pressey <[email protected]>
+Clark Gaebel <[email protected]> <[email protected]>
+David Klein <[email protected]>
+David Manescu <[email protected]> <[email protected]>
+Damien Schoof <[email protected]>
+Derek Chiang <[email protected]> Derek Chiang (Enchi Jiang) <[email protected]>
+Dylan Braithwaite <[email protected]> <[email protected]>
+Eduardo Bautista <[email protected]> <[email protected]>
+Eduardo Bautista <[email protected]> <=>
+Elliott Slaughter <[email protected]> <[email protected]>
+Elly Fong-Jones <[email protected]>
+Eric Holk <[email protected]> <[email protected]>
+Eric Holk <[email protected]> <[email protected]>
+Eric Holmes <[email protected]>
+Eric Reed <[email protected]> <[email protected]>
+Erick Tryzelaar <[email protected]> <[email protected]>
+Evgeny Sologubov
+Falco Hirschenberger <[email protected]> <[email protected]>
+Gareth Daniel Smith <[email protected]>
+Georges Dubus <[email protected]> <[email protected]>
+Graham Fawcett <[email protected]> <[email protected]>
+Graydon Hoare <[email protected]> <[email protected]>
+Heather <[email protected]> <[email protected]>
+Heather <[email protected]> <[email protected]>
+Ilyong Cho <[email protected]>
+J. J. Weber <[email protected]>
+Jakub Bukaj <[email protected]>
+Jakub Bukaj <[email protected]> <[email protected]>
+James Deng <[email protected]> <[email protected]>
+James Miller <[email protected]> <[email protected]>
+Jason Orendorff <[email protected]> <[email protected]>
+Jason Orendorff <[email protected]> <[email protected]>
+Jeremy Letang <[email protected]>
+Jihyun Yu <[email protected]> jihyun <[email protected]>
+Jihyun Yu <[email protected]> <[email protected]>
+John Clements <[email protected]> <[email protected]>
+Jorge Aparicio <[email protected]> <[email protected]>
+Jonathan Bailey <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
+Jyun-Yan You <[email protected]> <[email protected]>
+Kang Seonghoon <[email protected]> <[email protected]>
+Keegan McAllister <[email protected]> <[email protected]>
+Kyeongwoon Lee <[email protected]>
+Lee Wondong <[email protected]>
+Lennart Kudling <[email protected]>
+Lindsey Kuper <[email protected]> <[email protected]>
+Lindsey Kuper <[email protected]> <[email protected]>
+Luqman Aden <[email protected]> <[email protected]>
+Luqman Aden <[email protected]> <[email protected]>
+Luke Metz <[email protected]>
+Makoto Nakashima <[email protected]> <[email protected]>
+Makoto Nakashima <[email protected]> gifnksm <[email protected]>
+Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
+Mark Sinclair <[email protected]>
+Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
+Matt Brubeck <[email protected]> <[email protected]>
+Matthew Auld <[email protected]>
+Matthew McPherrin <[email protected]> <[email protected]>
 Matthijs Hofstra <[email protected]>
+Michael Williams <[email protected]>
+Michael Woerister <michaelwoerister@gmail> <[email protected]>
+Michael Woerister <michaelwoerister@gmail> <michaelwoerister@posteo>
+Neil Pankey <[email protected]> <[email protected]>
+Philipp Brüschweiler <[email protected]> <[email protected]>
+Philipp Brüschweiler <[email protected]> <[email protected]>
+Pradeep Kumar <[email protected]>
+Richard Diamond <[email protected]> <[email protected]>
 Rob Arnold <[email protected]>
+Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
+Robert Millar <[email protected]>
+Ryan Scheel <[email protected]>
+Seonghyun Kim <[email protected]>
+Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
+Simon Sapin <[email protected]> <[email protected]>
+startling <[email protected]>
+Steven Fackler <[email protected]> <[email protected]>
+Steven Stewart-Gallus <[email protected]> <[email protected]>
+Tim Chevalier <[email protected]> <[email protected]>
+Torsten Weber <[email protected]> <[email protected]>
+William Ting <[email protected]> <[email protected]>
+Youngsoo Son <[email protected]> <[email protected]>
+Zack Corr <[email protected]> <[email protected]>
+Zack Slayton <[email protected]>

trunk/.travis.yml

@@ -1,60 +1,19 @@
 # Use something that's not 'ruby' so we don't set up things like
-# RVM/bundler/ruby and whatnot. Right now 'rust' isn't a language on travis and
-# it treats unknown languages as ruby-like I believe.
+# RVM/bundler/ruby and whatnot. Right now 'rust' as a language actually
+# downloads a rust/cargo snapshot, which we don't really want for building rust.
 language: c
 
-# Before we start doing anything, install a stock LLVM
-install:
-  - sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.4 main' >> /etc/apt/sources.list"
-  - sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
-  - sudo sh -c "echo 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main' >> /etc/apt/sources.list"
-  - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq --force-yes -y llvm-$LLVM_VERSION
-    llvm-${LLVM_VERSION}-dev clang-$LLVM_VERSION lldb-$LLVM_VERSION
-
-
-# All of the llvm tools are suffixed with "-$VERS" which we don't want, so
-# symlink them all into a local directory and just use that
+# The test suite is in general way too stressful for travis, especially in
+# terms of time limit and reliability. In the past we've tried to scale things
+# back to only build the stage1 compiler and run a subset of tests, but this
+# didn't end up panning out very well.
 #
-# FIXME: this shouldn't update the src/llvm sub-repo, that takes about a minute
-#        it's gotta download so much stuff.
+# As a result, we're just using travis to run `make tidy` now. It'll help
+# everyone find out about their trailing spaces early on!
 before_script:
-  - mkdir -p local-llvm/bin
-  - ln -nsf /usr/bin/llvm-config-$LLVM_VERSION local-llvm/bin/llvm-config
-  - ln -nsf /usr/bin/llvm-mc-$LLVM_VERSION local-llvm/bin/llvm-mc
-  - ln -nsf /usr/bin/llvm-as-$LLVM_VERSION local-llvm/bin/llvm-as
-  - 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
-
-# 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
-# isn't exhaustive at all.
-#
-# As a result of https://github.com/travis-ci/travis-ci/issues/1066, we run
-# everything in one large command instead of multiple commands.
-script: |
-  if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then
-    if [[ $LLVM_VERSION != '3.4' ]]; then exit 0; fi
-  fi &&
-  make tidy &&
-  make -j4 rustc-stage1 RUSTFLAGS='-Z time-passes' &&
-  make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
-
-env:
-  global:
-    - NO_BENCH=1
-  matrix:
-    - LLVM_VERSION=3.3
-    - LLVM_VERSION=3.4
-
-# We track this ourselves, and in theory we don't have to update the LLVM repo
-# (but sadly we do right now anyway).
-git:
-  submodules: false
+  - ./configure --llvm-root=path/to/nowhere
+script:
+  - make tidy
 
 notifications:
   email: false