---

yaml
---
r: 235502
b: refs/heads/stable
c: 36882a0
h: refs/heads/master
v: v3

Author: nhowell

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: d354d41fd5ddaeb6e1e902856d98cb52cc22d711
+refs/heads/stable: 36882a00074b0a444041f5348146ad66343c3e59
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/.mailmap

@@ -8,13 +8,12 @@
 Aaron Todd <[email protected]>
 Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
 Ahmed Charles <[email protected]> <[email protected]>
-Aydin Kim <[email protected]> aydin.kim <[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]> arielb1 <[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]>
@@ -39,15 +38,13 @@ Eduardo Bautista <[email protected]> <[email protected]>
 Eduardo Bautista <[email protected]> <=>
 Elliott Slaughter <[email protected]> <[email protected]>
 Elly Fong-Jones <[email protected]>
-Emily Dunham <[email protected]> edunham <[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]>
-Felix S. Klock II <[email protected]> Felix S Klock II <[email protected]>
 Gareth Daniel Smith <[email protected]>
 Georges Dubus <[email protected]> <[email protected]>
 Graham Fawcett <[email protected]> <[email protected]>
@@ -67,7 +64,6 @@ Jihyun Yu <[email protected]> jihyun <[email protected]>
 Jihyun Yu <[email protected]> <[email protected]>
 Johann Hofmann <[email protected]> Johann <[email protected]> Johann Hofmann <[email protected]>
 John Clements <[email protected]> <[email protected]>
-John Hodge <[email protected]> John Hodge <[email protected]>
 Jorge Aparicio <[email protected]> <[email protected]>
 Jonathan Bailey <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
@@ -84,24 +80,20 @@ Luqman Aden <[email protected]> <[email protected]>
 Luke Metz <[email protected]>
 Makoto Nakashima <[email protected]> <[email protected]>
 Makoto Nakashima <[email protected]> gifnksm <[email protected]>
-Markus Westerlind <[email protected]> Markus <[email protected]>
 Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
 Mark Sinclair <[email protected]>
 Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
-Matej Lach <[email protected]> Matej Ľach <[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]> <michaelwoerister@posteo> Michael Woerister <michaelwoerister@posteo>
+Michael Woerister <michaelwoerister@gmail> <[email protected]>
+Michael Woerister <michaelwoerister@gmail> <michaelwoerister@posteo>
 Neil Pankey <[email protected]> <[email protected]>
 Nicholas Mazzuca <[email protected]> Nicholas <[email protected]>
-Oliver Schneider <[email protected]> <[email protected]> <[email protected]> Oliver 'ker' Schneider <[email protected]>
 Ožbolt Menegatti <[email protected]> gareins <[email protected]>
-Paul Faria <[email protected]> Paul Faria <[email protected]>
 Peer Aramillo Irizar <[email protected]> parir <[email protected]>
-Peter Elmers <[email protected]> <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Pradeep Kumar <[email protected]>
@@ -113,7 +105,6 @@ Robert Foss <[email protected]> robertfoss <[email protected]>
 Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
 Robert Millar <[email protected]>
 Ryan Scheel <[email protected]>
-Sean Gillespie <[email protected]> swgillespie <[email protected]>
 Seonghyun Kim <[email protected]>
 Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
 Simon Sapin <[email protected]> <[email protected]>
@@ -123,9 +114,7 @@ Steven Stewart-Gallus <[email protected]> <sstewartgallus00@mylanga
 Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
 Tim Chevalier <[email protected]> <[email protected]>
 Torsten Weber <[email protected]> <[email protected]>
-Vadim Petrochenkov <[email protected]> petrochenkov <[email protected]>
 William Ting <[email protected]> <[email protected]>
-Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
 Zack Corr <[email protected]> <[email protected]>
 Zack Slayton <[email protected]>

branches/stable/.travis.yml

@@ -1,38 +1,20 @@
-# ccache support is disabled unless your language is a C-derivative. However
-# `language: C` unconditionally sets `CC=compiler`. If we just set it in our
-# `env` it will be overwritten by the default (gcc 4.6).
+# Use something that's not 'ruby' so we don't set up things like
+# 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
-compiler: /usr/bin/gcc-4.7
-cache: ccache
 sudo: false
 
 # 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.
 #
-# As a result, we're just using travis to run `make tidy` and *only* build
-# stage1 but *not* test it for now (a strict subset of the bootstrap). This will
-# catch "obvious" errors like style or not even compiling.
-#
-# We need gcc4.7 or higher to build LLVM, and travis (well, Ubuntu 12.04)
-# currently ships with 4.6. Gotta download our own.
+# 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:
-  - ./configure --enable-ccache
+  - ./configure --llvm-root=path/to/nowhere
 script:
   - make tidy
-  - make rustc-stage1 -j4
-
-env:
-  - CXX=/usr/bin/g++-4.7
-
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - gcc-4.7
-    - g++-4.7
 
 # Real testing happens on http://buildbot.rust-lang.org/
 #