Skip to content

Commit bc2b37a

Browse files
committed
Merge branch 'master' into E0688
2 parents e3ae4c7 + 9d09331 commit bc2b37a

File tree

6,127 files changed

+252064
-67169
lines changed

Some content is hidden

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

6,127 files changed

+252064
-67169
lines changed

.github/workflows/ci.yml

+138-186
Large diffs are not rendered by default.

.gitmodules

+4-4
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
@@ -40,7 +37,10 @@
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/10.0-2020-05-05
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

.mailmap

+9
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ Brian Anderson <[email protected]> <[email protected]>
4444
4545
Brian Dawn <[email protected]>
4646
Brian Leibig <[email protected]> Brian Leibig <[email protected]>
47+
4748
Carl-Anton Ingmarsson <[email protected]> <[email protected]>
4849
Carol (Nichols || Goulding) <[email protected]> <[email protected]>
4950
Carol (Nichols || Goulding) <[email protected]> <[email protected]>
5051
Carol (Nichols || Goulding) <[email protected]> <[email protected]>
5152
Carol Willing <[email protected]>
53+
Charles Lew <[email protected]> CrLF0710 <[email protected]>
5254
Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
5355
Chris Pressey <[email protected]>
5456
Chris Thorn <[email protected]> Chris Thorn <[email protected]>
@@ -69,6 +71,8 @@ David Manescu <[email protected]> <[email protected]>
6971
David Ross <[email protected]>
7072
Derek Chiang <[email protected]> Derek Chiang (Enchi Jiang) <[email protected]>
7173
Diggory Hardy <[email protected]> Diggory Hardy <[email protected]>
74+
75+
Donough Liu <[email protected]> DingMing Liu <[email protected]>
7276
Dustin Bensing <[email protected]>
7377
7478
Dzmitry Malyshau <[email protected]>
@@ -149,6 +153,10 @@ Kang Seonghoon <[email protected]> <[email protected]>
149153
150154
Kevin Butler <[email protected]>
151155
Kyeongwoon Lee <[email protected]>
156+
157+
158+
159+
152160
Laurențiu Nicola <[email protected]>
153161
Lee Jeffery <[email protected]> Lee Jeffery <[email protected]>
154162
Lee Wondong <[email protected]>
@@ -258,6 +266,7 @@ Tim Chevalier <[email protected]> <[email protected]>
258266
Tim JIANG <[email protected]>
259267
Tim Joseph Dumol <[email protected]>
260268
269+
261270
Ty Overby <[email protected]>
262271
Ulrik Sverdrup <[email protected]> bluss <[email protected]>
263272
Ulrik Sverdrup <[email protected]> bluss <bluss>

0 commit comments

Comments
 (0)