Skip to content

Commit 4c4b648

Browse files
committed
---
yaml --- r: 142572 b: refs/heads/try2 c: 29d8300 h: refs/heads/master v: v3
1 parent f74453b commit 4c4b648

File tree

1,653 files changed

+59426
-135377
lines changed

Some content is hidden

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

1,653 files changed

+59426
-135377
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 137d1fb210a844a76f89d7355a1aaf9f7a88af33
8+
refs/heads/try2: 29d83002a27e6f47759b4a3bfe741fb061107816
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
src/rt/msvc/* -whitespace
88
src/rt/vg/* -whitespace
99
src/rt/linenoise/* -whitespace
10-
src/rt/jemalloc/**/* -whitespace

branches/try2/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ src/.DS_Store
7373
/doc/html
7474
/doc/latex
7575
/doc/std
76-
/doc/extra
7776
/nd/
7877
/llvm/
7978
version.md
@@ -82,6 +81,7 @@ keywords.md
8281
x86_64-apple-darwin/
8382
x86_64-unknown-linux-gnu/
8483
i686-unknown-linux-gnu/
84+
doc/core/
8585
tmp.*.rs
8686
config.stamp
8787
.DS_Store

branches/try2/.gitmodules

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[submodule "src/llvm"]
22
path = src/llvm
33
url = https://github.com/brson/llvm.git
4-
branch = master
54
[submodule "src/libuv"]
65
path = src/libuv
76
url = https://github.com/brson/libuv.git
8-
branch = master

branches/try2/.mailmap

Lines changed: 0 additions & 12 deletions
This file was deleted.

branches/try2/AUTHORS.txt

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ Aleksander Balicki <[email protected]>
1010
Alex Crichton <[email protected]>
1111
Alex Rønne Petersen <[email protected]>
1212
Alexander Stavonin <[email protected]>
13-
Alexei Sholik <[email protected]>
1413
Andreas Gal <[email protected]>
1514
Andrew Dunham <[email protected]>
1615
Andrew Paseltiner <[email protected]>
17-
Anthony Juckel <[email protected]>
1816
Arkaitz Jimenez <[email protected]>
1917
Armin Ronacher <[email protected]>
2018
Ashok Gautham <[email protected]>
@@ -31,32 +29,23 @@ Benjamin Kircher <[email protected]>
3129
Benjamin Peterson <[email protected]>
3230
Bilal Husain <[email protected]>
3331
Bill Fallon <[email protected]>
34-
Bill Myers <[email protected]>
35-
Bill Wendling <[email protected]>
36-
Björn Steinbrink <[email protected]>
3732
Brendan Eich <[email protected]>
3833
Brendan Zabarauskas <[email protected]>
3934
Brett Cannon <[email protected]>
4035
Brian Anderson <[email protected]>
4136
Brian J. Burg <[email protected]>
4237
Brian Leibig <[email protected]>
43-
Bryan Dunsmore <[email protected]>
44-
Caitlin Potter <[email protected]>
4538
Chris Double <[email protected]>
4639
Chris Peterson <[email protected]>
4740
Chris Pressey <[email protected]>
4841
Cody Schroeder <[email protected]>
49-
Corey Richardson <[email protected]>
5042
Damian Gryski <[email protected]>
5143
Damien Grassart <[email protected]>
5244
Damien Schoof <[email protected]>
5345
Daniel Brooks <[email protected]>
54-
Daniel Farina <[email protected]>
55-
5646
Daniel Luz <[email protected]>
5747
Daniel Micay <[email protected]>
5848
Daniel Patterson <[email protected]>
59-
Daniel Ralston <[email protected]>
6049
Daniel Ursache Dogariu <[email protected]>
6150
Dave Herman <[email protected]>
6251
David Forsythe <[email protected]>
@@ -73,21 +62,17 @@ Eric Holmes <[email protected]>
7362
Erick Tryzelaar <[email protected]>
7463
Erik Rose <[email protected]>
7564
Evan McClanahan <[email protected]>
76-
Fedor Indutny <[email protected]>
7765
Felix S. Klock II <[email protected]>
7866
Francisco Souza <[email protected]>
7967
Franklin Chen <[email protected]>
80-
Gábor Horváth <[email protected]>
8168
8269
Gareth Daniel Smith <[email protected]>
83-
8470
Glenn Willen <[email protected]>
8571
Gonçalo Cabrita <[email protected]>
8672
Graham Fawcett <[email protected]>
8773
Grahame Bowland <[email protected]>
8874
Haitao Li <[email protected]>
8975
90-
Herman J. Radtke III <[email protected]>
9176
Huon Wilson <[email protected]>
9277
Ian D. Bollinger <[email protected]>
9378
Ilyong Cho <[email protected]>
@@ -98,7 +83,6 @@ Jacob Harris Cryer Kragh <[email protected]>
9883
Jacob Parker <[email protected]>
9984
Jakub Wieczorek <[email protected]>
10085
James Miller <[email protected]>
101-
James Tranovich <[email protected]>
10286
Jason Orendorff <[email protected]>
10387
Jed Davis <[email protected]>
10488
Jeff Balogh <[email protected]>
@@ -108,7 +92,6 @@ Jeffrey Yasskin <[email protected]>
10892
Jeong YunWon <[email protected]>
10993
Jens Nockert <[email protected]>
11094
Jesse Jones <[email protected]>
111-
Jesse Luehrs <[email protected]>
11295
Jesse Ruderman <[email protected]>
11396
Jihyun Yu <[email protected]>
11497
Jim Blandy <[email protected]>
@@ -121,18 +104,14 @@ Jonathan Sternberg <[email protected]>
121104
Josh Matthews <[email protected]>
122105
Joshua Clark <[email protected]>
123106
Joshua Wise <[email protected]>
124-
Junyoung Cho <[email protected]>
125107
Jyun-Yan You <[email protected]>
126108
Kang Seonghoon <[email protected]>
127109
Kelly Wilson <[email protected]>
128110
Kevin Atkinson <[email protected]>
129-
Kevin Ballard <[email protected]>
130111
Kevin Cantu <[email protected]>
131-
132112
Kyeongwoon Lee <[email protected]>
133113
Laurent Bonnans <[email protected]>
134114
Lawrence Velázquez <[email protected]>
135-
Leah Hanson <[email protected]>
136115
Lennart Kudling <[email protected]>
137116
Lindsey Kuper <[email protected]>
138117
Luca Bruno <[email protected]>
@@ -143,7 +122,6 @@ Margaret Meyerhofer <[email protected]>
143122
Marijn Haverbeke <[email protected]>
144123
Mark Lacey <[email protected]>
145124
Mark Vian <[email protected]>
146-
Marti Raudsepp <[email protected]>
147125
Martin DeMello <[email protected]>
148126
Marvin Löbel <[email protected]>
149127
Matt Brubeck <[email protected]>
@@ -165,64 +143,43 @@ Patrick Walton <[email protected]>
165143
Patrik Kårlin <[email protected]>
166144
Paul Stansifer <[email protected]>
167145
Paul Woolcock <[email protected]>
168-
Pavel Panchekha <[email protected]>
169146
Peter Hull <[email protected]>
170147
Peter Williams <[email protected]>
171148
Philipp Brüschweiler <[email protected]>
172149
Rafael Ávila de Espíndola <[email protected]>
173-
Ralph Bodenner <[email protected]>
174150
Ralph Giles <[email protected]>
175-
Ramkumar Ramachandra <[email protected]>
176151
Reuben Morais <[email protected]>
177152
Rick Waldron <[email protected]>
178153
Rob Arnold <[email protected]>
179-
Rob Hoelz <[email protected]>
180154
Roland Tanglao <[email protected]>
181-
Ron Dahlgren <[email protected]>
182155
Roy Frostig <[email protected]>
183156
Ryan Scheel <[email protected]>
184-
Samuel Chase <[email protected]>
185-
Sander Mathijs van Veen <[email protected]>
186-
Sangeun Kim <[email protected]>
187-
Saurabh Anand <[email protected]>
188-
Sean Moon <[email protected]>
189157
Sean Stangl <[email protected]>
190158
Sebastian N. Fernandez <[email protected]>
191159
Seth Pink <[email protected]>
192160
Seo Sanghyeon <[email protected]>
193161
194-
SiegeLord <[email protected]>
195162
Simon Barber-Dueck <[email protected]>
196163
Simon Sapin <[email protected]>
197164
startling <[email protected]>
198165
Stefan Plantikow <[email protected]>
199166
Steve Klabnik <[email protected]>
200-
Steven De Coeyer <[email protected]>
201-
Steven Fackler <[email protected]>
202-
Steven Stewart-Gallus <[email protected]>
203167
Taras Shpot <[email protected]>
204168
Ted Horst <[email protected]>
205169
Thad Guidry <[email protected]>
206-
Thomas Daede <[email protected]>
207170
Tim Chevalier <[email protected]>
208171
Tim Taubert <[email protected]>
209172
210-
Tommy M. McGuire <[email protected]>
211173
Tomoki Aonuma <[email protected]>
212174
Tony Young <[email protected]>
213175
214176
Tycho Sci <[email protected]>
215177
Tyler Bindon <[email protected]>
216-
Uwe Dauernheim <[email protected]>
217-
Vadim Chugunov <[email protected]>
218178
Viktor Dahl <[email protected]>
219179
Vincent Belliard <[email protected]>
220-
Vivek Galatage <[email protected]>
221180
Wade Mealing <[email protected]>
222181
William Ting <[email protected]>
223182
Yasuhiro Fujii <[email protected]>
224183
Young-il Choi <[email protected]>
225-
Youngmin Yoo <[email protected]>
226184
Youngsoo Son <[email protected]>
227185
Zack Corr <[email protected]>
228-

branches/try2/CONTRIBUTING.md

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,27 @@
11
## Pull request procedure
22

3-
Pull requests should be targeted at Rust's `master` branch.
4-
Before pushing to your Github repo and issuing the pull request,
5-
please do two things:
3+
Pull requests should be targeted at Rust's `incoming` branch (note that by default Github will aim them at the `master` branch) --
4+
see "Changing The Commit Range and Destination Repository" in Github's documentation on [pull requests](https://help.github.com/articles/using-pull-requests).
5+
Before pushing to your Github repo and issuing the pull request, please do two things:
66

7-
1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your
8-
local changes against the `master` branch. Resolve any conflicts
9-
that arise.
7+
1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your local changes against the `incoming` branch. Resolve any conflicts that arise.
8+
2. Run the full Rust test suite with the `make check` command.
9+
You're not off the hook even if you just stick to documentation; code examples in the docs are tested as well!
1010

11-
2. Run the full Rust test suite with the `make check` command. You're
12-
not off the hook even if you just stick to documentation; code
13-
examples in the docs are tested as well!
11+
Pull requests will be treated as "review requests",
12+
and we will give feedback we expect to see corrected on [style](https://github.com/mozilla/rust/wiki/Note-style-guide) and substance before pulling.
13+
Changes contributed via pull request should focus on a single issue at a time, like any other.
14+
We will not accept pull-requests that try to "sneak" unrelated changes in.
1415

15-
Pull requests will be treated as "review requests", and we will give
16-
feedback we expect to see corrected on
17-
[style](https://github.com/mozilla/rust/wiki/Note-style-guide) and
18-
substance before pulling. Changes contributed via pull request should
19-
focus on a single issue at a time, like any other. We will not accept
20-
pull-requests that try to "sneak" unrelated changes in.
16+
Normally, all pull requests must include regression tests (see [Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite)) that test your change.
17+
Occasionally, a change will be very difficult to test for.
18+
In those cases, please include a note in your commit message explaining why.
2119

22-
Normally, all pull requests must include regression tests (see
23-
[Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite))
24-
that test your change. Occasionally, a change will be very difficult
25-
to test for. In those cases, please include a note in your commit
26-
message explaining why.
27-
28-
In the licensing header at the beginning of any files you change,
29-
please make sure the listed date range includes the current year. For
30-
example, if it's 2013, and you change a Rust file that was created in
31-
2010, it should begin:
20+
In the licensing header at the beginning of any files you change, please make sure the listed date range includes the current year.
21+
For example, if it's 2013, and you change a Rust file that was created in 2010, it should begin:
3222

3323
```
3424
// Copyright 2010-2013 The Rust Project Developers.
3525
```
3626

37-
For more details, please refer to
38-
[Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).
27+
For more details, please refer to [Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).

0 commit comments

Comments
 (0)