Skip to content

Commit fb3a013

Browse files
authored
Merge pull request #1 from rust-lang/master
Merge recent changes into master
2 parents 33445ae + 5aa3d9a commit fb3a013

File tree

12,049 files changed

+237585
-181129
lines changed

Some content is hidden

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

12,049 files changed

+237585
-181129
lines changed

.gitignore

+9-24
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This file should only ignore things that are generated during a build,
2+
# generated by common IDEs, and optional files controlled by the user
3+
# that affect the build (such as config.toml).
4+
# FIXME: This needs cleanup.
15
*~
26
.#*
37
.DS_Store
@@ -12,22 +16,18 @@ __pycache__/
1216
.project
1317
.settings/
1418
.valgrindrc
15-
.vscode/
19+
.vscode
1620
.favorites.json
17-
/*-*-*-*/
18-
/*-*-*/
1921
/Makefile
20-
/build
22+
/build/
2123
/config.toml
2224
/dist/
2325
/dl/
24-
/doc
26+
/doc/
2527
/inst/
2628
/llvm/
2729
/mingw-build/
28-
/nd/
2930
/obj/
30-
/rt/
3131
/rustllvm/
3232
/src/libcore/unicode/DerivedCoreProperties.txt
3333
/src/libcore/unicode/DerivedNormalizationProps.txt
@@ -36,11 +36,8 @@ __pycache__/
3636
/src/libcore/unicode/Scripts.txt
3737
/src/libcore/unicode/SpecialCasing.txt
3838
/src/libcore/unicode/UnicodeData.txt
39-
/stage[0-9]+/
40-
/target
41-
target/
42-
/test/
43-
/tmp/
39+
/src/libcore/unicode/downloaded
40+
/target/
4441
tags
4542
tags.*
4643
TAGS
@@ -49,18 +46,6 @@ TAGS.*
4946
\#*\#
5047
config.mk
5148
config.stamp
52-
keywords.md
53-
lexer.ml
54-
mir_dump
5549
Session.vim
56-
src/etc/dl
57-
tmp.*.rs
58-
version.md
59-
version.ml
60-
version.texi
6150
.cargo
62-
!src/vendor/**
63-
/src/target/
64-
6551
no_llvm_build
66-

.gitmodules

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
[submodule "src/llvm-emscripten"]
3232
path = src/llvm-emscripten
3333
url = https://github.com/rust-lang/llvm.git
34-
[submodule "src/stdsimd"]
35-
path = src/stdsimd
36-
url = https://github.com/rust-lang-nursery/stdsimd.git
34+
[submodule "src/stdarch"]
35+
path = src/stdarch
36+
url = https://github.com/rust-lang/stdarch.git
3737
[submodule "src/doc/rustc-guide"]
3838
path = src/doc/rustc-guide
3939
url = https://github.com/rust-lang/rustc-guide.git
@@ -43,7 +43,7 @@
4343
[submodule "src/llvm-project"]
4444
path = src/llvm-project
4545
url = https://github.com/rust-lang/llvm-project.git
46-
branch = rustc/8.0-2019-01-16
46+
branch = rustc/9.0-2019-07-12
4747
[submodule "src/doc/embedded-book"]
4848
path = src/doc/embedded-book
4949
url = https://github.com/rust-embedded/book.git

.mailmap

+26-13
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# email addresses.
66
#
77

8+
Aaron Power <[email protected]> Erin Power <[email protected]>
89
Aaron Todd <[email protected]>
9-
Aaron Power <[email protected]>
1010
Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
1111
Adolfo Ochagavía <[email protected]>
1212
Adrien Tétar <[email protected]>
@@ -30,6 +30,7 @@ Ariel Ben-Yehuda <[email protected]> arielb1 <[email protected]>
3030
3131
Aydin Kim <[email protected]> aydin.kim <[email protected]>
3232
Barosl Lee <[email protected]> Barosl LEE <[email protected]>
33+
Bastian Kauschke <[email protected]>
3334
3435
3536
@@ -45,21 +46,24 @@ Brian Anderson <[email protected]> <[email protected]>
4546
Brian Dawn <[email protected]>
4647
Brian Leibig <[email protected]> Brian Leibig <[email protected]>
4748
Carl-Anton Ingmarsson <[email protected]> <[email protected]>
49+
Carol (Nichols || Goulding) <[email protected]> <[email protected]>
50+
Carol (Nichols || Goulding) <[email protected]> <[email protected]>
4851
Carol (Nichols || Goulding) <[email protected]> <[email protected]>
49-
Carol (Nichols || Goulding) <[email protected]> Carol Nichols <[email protected]>
5052
Carol Willing <[email protected]>
5153
Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
5254
Chris Pressey <[email protected]>
5355
Chris Thorn <[email protected]> Chris Thorn <[email protected]>
5456
Chris Vittal <[email protected]> Christopher Vittal <[email protected]>
55-
57+
58+
59+
5660
5761
Clinton Ryan <[email protected]>
5862
Corey Richardson <[email protected]> Elaine "See More" Nemo <[email protected]>
5963
Cyryl Płotnicki <[email protected]>
6064
Damien Schoof <[email protected]>
61-
Daniel Ramos <[email protected]>
6265
Daniel J Rollins <[email protected]>
66+
Daniel Ramos <[email protected]>
6367
David Klein <[email protected]>
6468
6569
David Ross <[email protected]>
@@ -68,17 +72,19 @@ Diggory Hardy <[email protected]> Diggory Hardy <[email protected]>
6872
6973
Dzmitry Malyshau <[email protected]>
7074
75+
Eduard-Mihai Burtescu <[email protected]>
7176
Eduardo Bautista <[email protected]> <=>
7277
73-
Eduard-Mihai Burtescu <[email protected]>
7478
7579
Elly Fong-Jones <[email protected]>
7680
7781
7882
Eric Holmes <[email protected]>
7983
8084
81-
85+
86+
87+
8288
Evgeny Sologubov
8389
Falco Hirschenberger <[email protected]> <[email protected]>
8490
Felix S. Klock II <[email protected]> Felix S Klock II <[email protected]>
@@ -98,9 +104,9 @@ Herman J. Radtke III <[email protected]> Herman J. Radtke III <hermanradtk
98104
Ilyong Cho <[email protected]>
99105
Ivan Ivaschenko <[email protected]>
100106
J. J. Weber <[email protected]>
107+
Jakub Adam Wieczorek <[email protected]> <[email protected]>
101108
Jakub Adam Wieczorek <[email protected]> <[email protected]>
102109
Jakub Adam Wieczorek <[email protected]> <[email protected]>
103-
Jakub Adam Wieczorek <[email protected]> <[email protected]>
104110
105111
106112
James Perry <[email protected]>
@@ -115,6 +121,7 @@ Jethro Beekman <[email protected]>
115121
116122
117123
Jihyun Yu <[email protected]> Jihyun Yu <[email protected]>
124+
João Oliveira <[email protected]> joaoxsouls <[email protected]>
118125
Johann Hofmann <[email protected]> Johann <[email protected]>
119126
120127
John Hodge <[email protected]> John Hodge <[email protected]>
@@ -125,13 +132,15 @@ Jonathan S <[email protected]> Jonathan S <[email protected]>
125132
Jonathan Turner <[email protected]>
126133
127134
Joseph Martin <[email protected]>
128-
João Oliveira <[email protected]> joaoxsouls <[email protected]>
135+
136+
129137
Junyoung Cho <[email protected]>
130138
131139
132140
133141
Kevin Butler <[email protected]>
134142
Kyeongwoon Lee <[email protected]>
143+
Laurențiu Nicola <[email protected]>
135144
Lee Jeffery <[email protected]> Lee Jeffery <[email protected]>
136145
Lee Wondong <[email protected]>
137146
Lennart Kudling <[email protected]>
@@ -141,32 +150,36 @@ Lindsey Kuper <[email protected]> <[email protected]>
141150
Luke Metz <[email protected]>
142151
143152
144-
145-
146153
Marcell Pardavi <[email protected]>
147154
Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
148-
Mark Simulacrum <[email protected]>
155+
Mark Rousskov <[email protected]>
149156
Mark Sinclair <[email protected]>
150157
Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
151158
Markus Westerlind <[email protected]> Markus <[email protected]>
152159
Martin Hafskjold Thoresen <[email protected]>
153160
Matej Lach <[email protected]> Matej Ľach <[email protected]>
161+
162+
154163
155164
Matthew Auld <[email protected]>
156165
157166
Matthijs Hofstra <[email protected]>
158167
159168
Michael Williams <[email protected]>
160169
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
170+
Michael Woerister <michaelwoerister@posteo> <[email protected]>
171+
Michael Woerister <michaelwoerister@posteo> <[email protected]>
161172
Mickaël Raybaud-Roig <[email protected]> m-r-r <[email protected]>
162173
163174
Mukilan Thiagarajan <[email protected]>
175+
176+
164177
165178
Nathan Wilson <[email protected]>
166179
Nathaniel Herman <[email protected]> Nathaniel Herman <[email protected]>
167180
168-
Nicole Mazzuca <[email protected]>
169181
Nick Platt <[email protected]>
182+
Nicole Mazzuca <[email protected]>
170183
171184
Oliver Schneider <[email protected]> oli-obk <[email protected]>
172185
Oliver Schneider <[email protected]> Oliver 'ker' Schneider <[email protected]>
@@ -224,8 +237,8 @@ Tim JIANG <[email protected]>
224237
Tim Joseph Dumol <[email protected]>
225238
226239
Ty Overby <[email protected]>
240+
Ulrik Sverdrup <[email protected]> bluss <[email protected]>
227241
Ulrik Sverdrup <[email protected]> bluss <bluss>
228-
Ulrik Sverdrup <[email protected]> bluss <[email protected]> bluss <bluss>
229242
Ulrik Sverdrup <[email protected]> Ulrik Sverdrup <root@localhost>
230243
Vadim Petrochenkov <[email protected]>
231244
Vadim Petrochenkov <[email protected]> petrochenkov <[email protected]>

0 commit comments

Comments
 (0)