Skip to content

Commit 5802b63

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 46e801f + e88e908 commit 5802b63

File tree

9,779 files changed

+716133
-487180
lines changed

Some content is hidden

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

9,779 files changed

+716133
-487180
lines changed

.gitmodules

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
[submodule "src/tools/rls"]
1717
path = src/tools/rls
1818
url = https://github.com/rust-lang/rls.git
19-
[submodule "src/tools/clippy"]
20-
path = src/tools/clippy
21-
url = https://github.com/rust-lang/rust-clippy.git
2219
[submodule "src/tools/rustfmt"]
2320
path = src/tools/rustfmt
2421
url = https://github.com/rust-lang/rustfmt.git
@@ -28,8 +25,8 @@
2825
[submodule "src/doc/rust-by-example"]
2926
path = src/doc/rust-by-example
3027
url = https://github.com/rust-lang/rust-by-example.git
31-
[submodule "src/stdarch"]
32-
path = src/stdarch
28+
[submodule "library/stdarch"]
29+
path = library/stdarch
3330
url = https://github.com/rust-lang/stdarch.git
3431
[submodule "src/doc/rustc-dev-guide"]
3532
path = src/doc/rustc-dev-guide
@@ -40,7 +37,13 @@
4037
[submodule "src/llvm-project"]
4138
path = src/llvm-project
4239
url = https://github.com/rust-lang/llvm-project.git
43-
branch = rustc/9.0-2019-12-19
40+
branch = rustc/11.0-2020-08-20
4441
[submodule "src/doc/embedded-book"]
4542
path = src/doc/embedded-book
4643
url = https://github.com/rust-embedded/book.git
44+
[submodule "src/tools/rust-analyzer"]
45+
path = src/tools/rust-analyzer
46+
url = https://github.com/rust-analyzer/rust-analyzer.git
47+
[submodule "library/backtrace"]
48+
path = library/backtrace
49+
url = https://github.com/rust-lang/backtrace-rs.git

.mailmap

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ Brian Anderson <banderson@mozilla.com> <andersrb@gmail.com>
4444
Brian Anderson <banderson@mozilla.com> <banderson@mozilla.org>
4545
Brian Dawn <brian.t.dawn@gmail.com>
4646
Brian Leibig <brian@brianleibig.com> Brian Leibig <brian.leibig@gmail.com>
47+
Camelid <camelidcamel@gmail.com> <37223377+camelid@users.noreply.github.com>
4748
Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com>
4849
Carol (Nichols || Goulding) <carol.nichols@gmail.com> <193874+carols10cents@users.noreply.github.com>
4950
Carol (Nichols || Goulding) <carol.nichols@gmail.com> <carol.nichols@gmail.com>
5051
Carol (Nichols || Goulding) <carol.nichols@gmail.com> <cnichols@thinkthroughmath.com>
5152
Carol Willing <carolcode@willingconsulting.com>
53+
Charles Lew <crlf0710@gmail.com> CrLF0710 <crlf0710@gmail.com>
5254
Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com>
5355
Chris Pressey <cpressey@gmail.com>
5456
Chris Thorn <chris@thorn.co> Chris Thorn <thorn@thoughtbot.com>
@@ -69,6 +71,8 @@ David Manescu <david.manescu@gmail.com> <dman2626@uni.sydney.edu.au>
6971
David Ross <daboross@daboross.net>
7072
Derek Chiang <derekchiang93@gmail.com> Derek Chiang (Enchi Jiang) <derekchiang93@gmail.com>
7173
Diggory Hardy <diggory.hardy@gmail.com> Diggory Hardy <github@dhardy.name>
74+
Donough Liu <ldm2993593805@163.com> <donoughliu@gmail.com>
75+
Donough Liu <ldm2993593805@163.com> DingMing Liu <liudingming@bupt.edu.cn>
7276
Dustin Bensing <dustin.bensing@googlemail.com>
7377
Dylan Braithwaite <dylanbraithwaite1@gmail.com> <mail@dylanb.me>
7478
Dzmitry Malyshau <kvarkus@gmail.com>
@@ -149,6 +153,10 @@ Kang Seonghoon <kang.seonghoon@mearie.org> <public+git@mearie.org>
149153
Keegan McAllister <mcallister.keegan@gmail.com> <kmcallister@mozilla.com>
150154
Kevin Butler <haqkrs@gmail.com>
151155
Kyeongwoon Lee <kyeongwoon.lee@samsung.com>
156+
Kyle J Strand <batmanaod@gmail.com> <BatmanAoD@users.noreply.github.com>
157+
Kyle J Strand <batmanaod@gmail.com> <kyle.j.strand@gmail.com>
158+
Kyle J Strand <batmanaod@gmail.com> <kyle.strand@pieinsurance.com>
159+
Kyle J Strand <batmanaod@gmail.com> <kyle.strand@rms.com>
152160
Laurențiu Nicola <lnicola@dend.ro>
153161
Lee Jeffery <leejeffery@gmail.com> Lee Jeffery <lee@leejeffery.co.uk>
154162
Lee Wondong <wdlee91@gmail.com>
@@ -168,8 +176,8 @@ Mark Sinclair <mark.edward.x@gmail.com> =Mark Sinclair <=125axel125@gmail.com>
168176
Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com>
169177
Martin Hafskjold Thoresen <martinhath@gmail.com>
170178
Matej Lach <matej.lach@gmail.com> Matej Ľach <matej.lach@gmail.com>
171-
Mateusz Mikuła <matti@marinelayer.io> <mati865@gmail.com>
172-
Mateusz Mikuła <matti@marinelayer.io> <mati865@users.noreply.github.com>
179+
Mateusz Mikuła <mati865@gmail.com> <mati865@users.noreply.github.com>
180+
Mateusz Mikuła <mati865@gmail.com> <matti@marinelayer.io>
173181
Matt Brubeck <mbrubeck@limpet.net> <mbrubeck@cs.hmc.edu>
174182
Matthew Auld <matthew.auld@intel.com>
175183
Matthew Kraai <kraai@ftbfs.org>
@@ -258,6 +266,7 @@ Tim Chevalier <chevalier@alum.wellesley.edu> <catamorphism@gmail.com>
258266
Tim JIANG <p90eri@gmail.com>
259267
Tim Joseph Dumol <tim@timdumol.com>
260268
Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
269+
Trevor Spiteri <tspiteri@ieee.org> <trevor.spiteri@um.edu.mt>
261270
Ty Overby <ty@pre-alpha.com>
262271
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com>
263272
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss>

0 commit comments

Comments
 (0)