Skip to content

Commit 6f9ae95

Browse files
committed
---
yaml --- r: 220583 b: refs/heads/tmp c: 1da1a46 h: refs/heads/master i: 220581: 73e2bf3 220579: d7ab6e4 220575: f0388ca v: v3
1 parent e9a11d4 commit 6f9ae95

File tree

221 files changed

+5013
-2547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+5013
-2547
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: c8bab9d06a179028a0d5129aa62f09d694d9cc49
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: 60133aa6dd4bf288cacbaba72368f80c131d252c
28+
refs/heads/tmp: 1da1a46d563135233dec770abbe67fccc70bd434
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: 1b28ffa5216c845d1cef6b0cb3e5ac7db12025d0
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/.mailmap

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
Aaron Todd <[email protected]>
99
Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
1010
11+
Aydin Kim <[email protected]> aydin.kim <[email protected]>
1112
1213
Alex Rønne Petersen <[email protected]>
1314
1415
1516
16-
17+
1718
1819
1920
Benjamin Jackman <[email protected]>
@@ -38,13 +39,15 @@ Eduardo Bautista <[email protected]> <[email protected]>
3839
Eduardo Bautista <[email protected]> <=>
3940
4041
Elly Fong-Jones <[email protected]>
42+
Emily Dunham <[email protected]> edunham <[email protected]>
4143
4244
4345
Eric Holmes <[email protected]>
4446
4547
4648
Evgeny Sologubov
4749
Falco Hirschenberger <[email protected]> <[email protected]>
50+
Felix S. Klock II <[email protected]> Felix S Klock II <[email protected]>
4851
Gareth Daniel Smith <[email protected]>
4952
5053
@@ -64,6 +67,7 @@ Jihyun Yu <[email protected]> jihyun <[email protected]>
6467
6568
Johann Hofmann <[email protected]> Johann <[email protected]> Johann Hofmann <[email protected]>
6669
70+
John Hodge <[email protected]> John Hodge <[email protected]>
6771
6872
6973
Junyoung Cho <[email protected]>
@@ -80,20 +84,24 @@ Luqman Aden <[email protected]> <[email protected]>
8084
Luke Metz <[email protected]>
8185
8286
Makoto Nakashima <[email protected]> gifnksm <[email protected]>
87+
Markus Westerlind <[email protected]> Markus <[email protected]>
8388
Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
8489
Mark Sinclair <[email protected]>
8590
Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
91+
Matej Lach <[email protected]> Matej Ľach <[email protected]>
8692
8793
Matthew Auld <[email protected]>
8894
8995
Matthijs Hofstra <[email protected]>
9096
Michael Williams <[email protected]>
91-
Michael Woerister <michaelwoerister@gmail> <[email protected]>
92-
Michael Woerister <michaelwoerister@gmail> <michaelwoerister@posteo>
97+
Michael Woerister <michaelwoerister@gmail> <[email protected]> <michaelwoerister@posteo> Michael Woerister <michaelwoerister@posteo>
9398
9499
Nicholas Mazzuca <[email protected]> Nicholas <[email protected]>
100+
Oliver Schneider <[email protected]> <[email protected]> <[email protected]> Oliver 'ker' Schneider <[email protected]>
95101
Ožbolt Menegatti <[email protected]> gareins <[email protected]>
102+
Paul Faria <[email protected]> Paul Faria <[email protected]>
96103
Peer Aramillo Irizar <[email protected]> parir <[email protected]>
104+
97105
Philipp Brüschweiler <[email protected]> <[email protected]>
98106
Philipp Brüschweiler <[email protected]> <[email protected]>
99107
Pradeep Kumar <[email protected]>
@@ -105,6 +113,7 @@ Robert Foss <[email protected]> robertfoss <[email protected]>
105113
Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
106114
Robert Millar <[email protected]>
107115
Ryan Scheel <[email protected]>
116+
Sean Gillespie <[email protected]> swgillespie <[email protected]>
108117
Seonghyun Kim <[email protected]>
109118
Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
110119
@@ -114,7 +123,9 @@ Steven Stewart-Gallus <[email protected]> <sstewartgallus00@mylanga
114123
Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
115124
116125
126+
Vadim Petrochenkov <[email protected]> petrochenkov <[email protected]>
117127
128+
Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
118129
119130
120131
Zack Slayton <[email protected]>

branches/tmp/.travis.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
1-
# Use something that's not 'ruby' so we don't set up things like
2-
# RVM/bundler/ruby and whatnot. Right now 'rust' as a language actually
3-
# downloads a rust/cargo snapshot, which we don't really want for building rust.
1+
# ccache support is disabled unless your language is a C-derivative. However
2+
# `language: C` unconditionally sets `CC=compiler`. If we just set it in our
3+
# `env` it will be overwritten by the default (gcc 4.6).
44
language: c
5+
compiler: /usr/bin/gcc-4.7
6+
cache: ccache
57
sudo: false
68

79
# The test suite is in general way too stressful for travis, especially in
810
# terms of time limit and reliability. In the past we've tried to scale things
911
# back to only build the stage1 compiler and run a subset of tests, but this
1012
# didn't end up panning out very well.
1113
#
12-
# As a result, we're just using travis to run `make tidy` now. It'll help
13-
# everyone find out about their trailing spaces early on!
14+
# As a result, we're just using travis to run `make tidy` and *only* build
15+
# stage1 but *not* test it for now (a strict subset of the bootstrap). This will
16+
# catch "obvious" errors like style or not even compiling.
17+
#
18+
# We need gcc4.7 or higher to build LLVM, and travis (well, Ubuntu 12.04)
19+
# currently ships with 4.6. Gotta download our own.
1420
before_script:
15-
- ./configure --llvm-root=path/to/nowhere
21+
- ./configure --enable-ccache
1622
script:
1723
- make tidy
24+
- make rustc-stage1 -j4
25+
26+
env:
27+
- CXX=/usr/bin/g++-4.7
28+
29+
addons:
30+
apt:
31+
sources:
32+
- ubuntu-toolchain-r-test
33+
packages:
34+
- gcc-4.7
35+
- g++-4.7
1836

1937
# Real testing happens on http://buildbot.rust-lang.org/
2038
#

0 commit comments

Comments
 (0)