Merge pull request #2 from rust-lang/master

update from origin 2020-06-10

.github/workflows/ci.yml

@@ -442,7 +442,7 @@ jobs:
           - name: x86_64-msvc-cargo
             env:
               SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
-              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc"
+              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
               VCVARS_BAT: vcvars64.bat
               NO_DEBUG_ASSERTIONS: 1
               NO_LLVM_ASSERTIONS: 1

.mailmap

@@ -44,6 +44,7 @@ Brian Anderson <[email protected]> <[email protected]>
 Brian Anderson <[email protected]> <[email protected]>
 Brian Dawn <[email protected]>
 Brian Leibig <[email protected]> Brian Leibig <[email protected]>
+Camelid <[email protected]> <[email protected]>
 Carl-Anton Ingmarsson <[email protected]> <[email protected]>
 Carol (Nichols || Goulding) <[email protected]> <[email protected]>
 Carol (Nichols || Goulding) <[email protected]> <[email protected]>
@@ -70,6 +71,8 @@ David Manescu <[email protected]> <[email protected]>
 David Ross <[email protected]>
 Derek Chiang <[email protected]> Derek Chiang (Enchi Jiang) <[email protected]>
 Diggory Hardy <[email protected]> Diggory Hardy <[email protected]>
+Donough Liu <[email protected]> <[email protected]>
+Donough Liu <[email protected]> DingMing Liu <[email protected]>
 Dustin Bensing <[email protected]>
 Dylan Braithwaite <[email protected]> <[email protected]>
 Dzmitry Malyshau <[email protected]>
@@ -150,6 +153,10 @@ Kang Seonghoon <[email protected]> <[email protected]>
 Keegan McAllister <[email protected]> <[email protected]>
 Kevin Butler <[email protected]>
 Kyeongwoon Lee <[email protected]>
+Kyle J Strand <[email protected]> <[email protected]>
+Kyle J Strand <[email protected]> <[email protected]>
+Kyle J Strand <[email protected]> <[email protected]>
+Kyle J Strand <[email protected]> <[email protected]>
 Laurențiu Nicola <[email protected]>
 Lee Jeffery <[email protected]> Lee Jeffery <[email protected]>
 Lee Wondong <[email protected]>
@@ -259,6 +266,7 @@ Tim Chevalier <[email protected]> <[email protected]>
 Tim JIANG <[email protected]>
 Tim Joseph Dumol <[email protected]>
 Torsten Weber <[email protected]> <[email protected]>
+Trevor Spiteri <[email protected]> <[email protected]>
 Ty Overby <[email protected]>
 Ulrik Sverdrup <[email protected]> bluss <[email protected]>
 Ulrik Sverdrup <[email protected]> bluss <bluss>