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

Lines changed: 9 additions & 24 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# email addresses.
66
#
77

8+
Aaron Power <theaaronepower@gmail.com> Erin Power <xampprocky@gmail.com>
89
Aaron Todd <github@opprobrio.us>
9-
Aaron Power <theaaronepower@gmail.com>
1010
Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com>
1111
Adolfo Ochagavía <aochagavia92@gmail.com>
1212
Adrien Tétar <adri-from-59@hotmail.fr>
@@ -30,6 +30,7 @@ Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> arielb1 <arielb1@mail.tau.ac.il>
3030
Austin Seipp <mad.one@gmail.com> <as@hacks.yi.org>
3131
Aydin Kim <ladinjin@hanmail.net> aydin.kim <aydin.kim@samsung.com>
3232
Barosl Lee <vcs@barosl.com> Barosl LEE <github@barosl.com>
33+
Bastian Kauschke <bastian_kauschke@hotmail.de>
3334
Ben Alpert <ben@benalpert.com> <spicyjalapeno@gmail.com>
3435
Ben Sago <ogham@users.noreply.github.com> Ben S <ogham@bsago.me>
3536
Ben Sago <ogham@users.noreply.github.com> Ben S <ogham@users.noreply.github.com>
@@ -45,21 +46,24 @@ Brian Anderson <banderson@mozilla.com> <banderson@mozilla.org>
4546
Brian Dawn <brian.t.dawn@gmail.com>
4647
Brian Leibig <brian@brianleibig.com> Brian Leibig <brian.leibig@gmail.com>
4748
Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com>
49+
Carol (Nichols || Goulding) <carol.nichols@gmail.com> <193874+carols10cents@users.noreply.github.com>
50+
Carol (Nichols || Goulding) <carol.nichols@gmail.com> <carol.nichols@gmail.com>
4851
Carol (Nichols || Goulding) <carol.nichols@gmail.com> <cnichols@thinkthroughmath.com>
49-
Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <carol.nichols@gmail.com>
5052
Carol Willing <carolcode@willingconsulting.com>
5153
Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com>
5254
Chris Pressey <cpressey@gmail.com>
5355
Chris Thorn <chris@thorn.co> Chris Thorn <thorn@thoughtbot.com>
5456
Chris Vittal <christopher.vittal@gmail.com> Christopher Vittal <christopher.vittal@gmail.com>
55-
Christian Poveda <christianpoveda@protonmail.com> <z1mvader@protonmail.com> <cn.poveda.ruiz@gmail.com>
57+
Christian Poveda <christianpoveda@protonmail.com> <cn.poveda.ruiz@gmail.com>
58+
Christian Poveda <christianpoveda@protonmail.com> <z1mvader@protonmail.com>
59+
Christian Poveda <christianpoveda@protonmail.com> <cpovedar@fnal.gov>
5660
Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
5761
Clinton Ryan <clint.ryan3@gmail.com>
5862
Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net>
5963
Cyryl Płotnicki <cyplo@cyplo.net>
6064
Damien Schoof <damien.schoof@gmail.com>
61-
Daniel Ramos <dan@daramos.com>
6265
Daniel J Rollins <drollins@financialforce.com>
66+
Daniel Ramos <dan@daramos.com>
6367
David Klein <david.klein@baesystemsdetica.com>
6468
David Manescu <david.manescu@gmail.com> <dman2626@uni.sydney.edu.au>
6569
David Ross <daboross@daboross.net>
@@ -68,17 +72,19 @@ Diggory Hardy <diggory.hardy@gmail.com> Diggory Hardy <github@dhardy.name>
6872
Dylan Braithwaite <dylanbraithwaite1@gmail.com> <mail@dylanb.me>
6973
Dzmitry Malyshau <kvarkus@gmail.com>
7074
E. Dunham <edunham@mozilla.com> edunham <edunham@mozilla.com>
75+
Eduard-Mihai Burtescu <edy.burt@gmail.com>
7176
Eduardo Bautista <me@eduardobautista.com> <=>
7277
Eduardo Bautista <me@eduardobautista.com> <mail@eduardobautista.com>
73-
Eduard-Mihai Burtescu <edy.burt@gmail.com>
7478
Elliott Slaughter <elliottslaughter@gmail.com> <eslaughter@mozilla.com>
7579
Elly Fong-Jones <elly@leptoquark.net>
7680
Eric Holk <eric.holk@gmail.com> <eholk@cs.indiana.edu>
7781
Eric Holk <eric.holk@gmail.com> <eholk@mozilla.com>
7882
Eric Holmes <eric@ejholmes.net>
7983
Eric Reed <ecreed@cs.washington.edu> <ereed@mozilla.com>
8084
Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org>
81-
Esteban Küber <esteban@kuber.com.ar> <estebank@users.noreply.github.com> <esteban@commure.com> <github@kuber.com.ar>
85+
Esteban Küber <esteban@kuber.com.ar> <esteban@commure.com>
86+
Esteban Küber <esteban@kuber.com.ar> <estebank@users.noreply.github.com>
87+
Esteban Küber <esteban@kuber.com.ar> <github@kuber.com.ar>
8288
Evgeny Sologubov
8389
Falco Hirschenberger <falco.hirschenberger@gmail.com> <hirschen@itwm.fhg.de>
8490
Felix S. Klock II <pnkfelix@pnkfx.org> Felix S Klock II <pnkfelix@pnkfx.org>
@@ -98,9 +104,9 @@ Herman J. Radtke III <herman@hermanradtke.com> Herman J. Radtke III <hermanradtk
98104
Ilyong Cho <ilyoan@gmail.com>
99105
Ivan Ivaschenko <defuz.net@gmail.com>
100106
J. J. Weber <jjweber@gmail.com>
107+
Jakub Adam Wieczorek <jakub.adam.wieczorek@gmail.com> <jakub.bukaj@yahoo.com>
101108
Jakub Adam Wieczorek <jakub.adam.wieczorek@gmail.com> <jakub@jakub.cc>
102109
Jakub Adam Wieczorek <jakub.adam.wieczorek@gmail.com> <jakubw@jakubw.net>
103-
Jakub Adam Wieczorek <jakub.adam.wieczorek@gmail.com> <jakub.bukaj@yahoo.com>
104110
James Deng <cnjamesdeng@gmail.com> <cnJamesDeng@gmail.com>
105111
James Miller <bladeon@gmail.com> <james@aatch.net>
106112
James Perry <james.austin.perry@gmail.com>
@@ -115,6 +121,7 @@ Jethro Beekman <github@jbeekman.nl>
115121
Jihyun Yu <j.yu@navercorp.com> <yjh0502@gmail.com>
116122
Jihyun Yu <j.yu@navercorp.com> jihyun <jihyun@nablecomm.com>
117123
Jihyun Yu <j.yu@navercorp.com> Jihyun Yu <jihyun@nclab.kaist.ac.kr>
124+
João Oliveira <hello@jxs.pt> joaoxsouls <joaoxsouls@gmail.com>
118125
Johann Hofmann <git@johann-hofmann.com> Johann <git@johann-hofmann.com>
119126
John Clements <clements@racket-lang.org> <clements@brinckerhoff.org>
120127
John Hodge <acessdev@gmail.com> John Hodge <tpg@mutabah.net>
@@ -125,13 +132,15 @@ Jonathan S <gereeter@gmail.com> Jonathan S <gereeter+code@gmail.com>
125132
Jonathan Turner <probata@hotmail.com>
126133
Jorge Aparicio <japaric@linux.com> <japaricious@gmail.com>
127134
Joseph Martin <pythoner6@gmail.com>
128-
João Oliveira <hello@jxs.pt> joaoxsouls <joaoxsouls@gmail.com>
135+
Joseph T. Lyons <JosephTLyons@gmail.com> <josephtlyons@gmail.com>
136+
Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
129137
Junyoung Cho <june0.cho@samsung.com>
130138
Jyun-Yan You <jyyou.tw@gmail.com> <jyyou@cs.nctu.edu.tw>
131139
Kang Seonghoon <kang.seonghoon@mearie.org> <public+git@mearie.org>
132140
Keegan McAllister <mcallister.keegan@gmail.com> <kmcallister@mozilla.com>
133141
Kevin Butler <haqkrs@gmail.com>
134142
Kyeongwoon Lee <kyeongwoon.lee@samsung.com>
143+
Laurențiu Nicola <lnicola@dend.ro>
135144
Lee Jeffery <leejeffery@gmail.com> Lee Jeffery <lee@leejeffery.co.uk>
136145
Lee Wondong <wdlee91@gmail.com>
137146
Lennart Kudling <github@kudling.de>
@@ -141,32 +150,36 @@ Lindsey Kuper <lindsey@composition.al> <lkuper@mozilla.com>
141150
Luke Metz <luke.metz@students.olin.edu>
142151
Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca>
143152
Luqman Aden <me@luqman.ca> <laden@mozilla.com>
144-
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com>
145-
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm+github@gmail.com>
146153
Marcell Pardavi <marcell.pardavi@gmail.com>
147154
Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew>
148-
Mark Simulacrum <mark.simulacrum@gmail.com>
155+
Mark Rousskov <mark.simulacrum@gmail.com>
149156
Mark Sinclair <mark.edward.x@gmail.com>
150157
Mark Sinclair <mark.edward.x@gmail.com> =Mark Sinclair <=125axel125@gmail.com>
151158
Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com>
152159
Martin Hafskjold Thoresen <martinhath@gmail.com>
153160
Matej Lach <matej.lach@gmail.com> Matej Ľach <matej.lach@gmail.com>
161+
Mateusz Mikuła <matti@marinelayer.io> <mati865@gmail.com>
162+
Mateusz Mikuła <matti@marinelayer.io> <mati865@users.noreply.github.com>
154163
Matt Brubeck <mbrubeck@limpet.net> <mbrubeck@cs.hmc.edu>
155164
Matthew Auld <matthew.auld@intel.com>
156165
Matthew McPherrin <matthew@mcpherrin.ca> <matt@mcpherrin.ca>
157166
Matthijs Hofstra <thiezz@gmail.com>
158167
Melody Horn <melody@boringcactus.com> <mathphreak@gmail.com>
159168
Michael Williams <m.t.williams@live.com>
160169
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
170+
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@users.noreply.github.com>
171+
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@posteo.net>
161172
Mickaël Raybaud-Roig <raybaudroigm@gmail.com> m-r-r <raybaudroigm@gmail.com>
162173
Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com>
163174
Mukilan Thiagarajan <mukilanthiagarajan@gmail.com>
175+
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com>
176+
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm+github@gmail.com>
164177
Nathan West <Lucretiel@gmail.com> <lucretiel@gmail.com>
165178
Nathan Wilson <wilnathan@gmail.com>
166179
Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu>
167180
Neil Pankey <npankey@gmail.com> <neil@wire.im>
168-
Nicole Mazzuca <npmazzuca@gmail.com>
169181
Nick Platt <platt.nicholas@gmail.com>
182+
Nicole Mazzuca <npmazzuca@gmail.com>
170183
Nif Ward <nif.ward@gmail.com>
171184
Oliver Schneider <oliver.schneider@kit.edu> oli-obk <github6541940@oli-obk.de>
172185
Oliver Schneider <oliver.schneider@kit.edu> Oliver 'ker' Schneider <rust19446194516@oli-obk.de>
@@ -224,8 +237,8 @@ Tim JIANG <p90eri@gmail.com>
224237
Tim Joseph Dumol <tim@timdumol.com>
225238
Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
226239
Ty Overby <ty@pre-alpha.com>
240+
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com>
227241
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss>
228-
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com> bluss <bluss>
229242
Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost>
230243
Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
231244
Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com>

0 commit comments

Comments
 (0)