Skip to content

Commit 8b9e8b2

Browse files
authored
Merge branch 'main' into master
2 parents 1929b4e + 29e035e commit 8b9e8b2

File tree

4,649 files changed

+113172
-62485
lines changed

Some content is hidden

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

4,649 files changed

+113172
-62485
lines changed

.github/workflows/post-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Post merge analysis
66
on:
77
push:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
analysis:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ no_llvm_build
4848
/llvm/
4949
/mingw-build/
5050
/build
51-
/build-rust-analyzer/
51+
/build-rust-analyzer
5252
/dist/
5353
/unicode-downloads
5454
/target

.mailmap

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Aaron Todd <[email protected]>
99
Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
1010
Abhijeet Bhagat <[email protected]>
1111
Abroskin Alexander <[email protected]>
12-
Adolfo Ochagavía <[email protected]>
12+
1313
Adrian Heine né Lang <[email protected]>
1414
Adrien Tétar <[email protected]>
1515
@@ -36,12 +36,14 @@ Amanda Stjerna <[email protected]> <[email protected]>
3636
3737
3838
39+
3940
Ana-Maria Mihalache <[email protected]>
4041
Anatoly Ikorsky <[email protected]>
4142
Andre Bogus <[email protected]>
4243
4344
4445
Andrea Ciliberti <[email protected]>
46+
4547
4648
Andreas Jonson <[email protected]>
4749
Andrew Gauger <[email protected]>
@@ -86,7 +88,9 @@ bjorn3 <[email protected]> <[email protected]
8688
8789
8890
blake2-ppc <[email protected]> <blake2-ppc>
89-
blyxyas <[email protected]> Alejandra González <[email protected]>
91+
Alejandra González <[email protected]> blyxyas <[email protected]>
92+
Alejandra González <[email protected]> blyxyas <[email protected]>
93+
Alejandra González <[email protected]> Alejandra González <[email protected]>
9094
boolean_coercion <[email protected]>
9195
9296
bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
@@ -138,7 +142,6 @@ Christian Poveda <[email protected]> <[email protected].
138142
139143
Christian Vallentin <[email protected]>
140144
Christoffer Buchholz <[email protected]>
141-
Christopher Durham <[email protected]>
142145
143146
Clement Miao <[email protected]>
144147
Clément Renault <[email protected]>
@@ -147,6 +150,7 @@ Clinton Ryan <[email protected]>
147150
148151
149152
Crazycolorz5 <[email protected]>
153+
Crystal Durham <[email protected]>
150154
151155
Cyryl Płotnicki <[email protected]>
152156
Damien Schoof <[email protected]>
@@ -276,7 +280,8 @@ Irina Popa <[email protected]>
276280
Ivan Ivaschenko <[email protected]>
277281
ivan tkachenko <[email protected]>
278282
J. J. Weber <[email protected]>
279-
283+
284+
280285
281286
Jacob Hoffman-Andrews <[email protected]> <[email protected]>
282287
Jacob Greenfield <[email protected]>
@@ -292,6 +297,8 @@ Jakub Adam Wieczorek <[email protected]>
292297
Jakub Adam Wieczorek <[email protected]> <[email protected]>
293298
Jakub Adam Wieczorek <[email protected]> <[email protected]>
294299
Jakub Adam Wieczorek <[email protected]> <[email protected]>
300+
Jakub Adam Wieczorek <[email protected]> <[email protected]>
301+
Jakub Adam Wieczorek <[email protected]> <[email protected]>
295302
296303
James [Undefined] <[email protected]>
297304
@@ -303,6 +310,7 @@ Jamie Hill-Daniel <[email protected]> <[email protected]>
303310
Jana Dönszelmann <[email protected]>
304311
305312
313+
306314
307315
Jaro Fietz <[email protected]>
308316
Jason Fager <[email protected]>
@@ -313,6 +321,7 @@ Jason Toffaletti <[email protected]> Jason Toffaletti <[email protected]>
313321
Jauhien Piatlicki <[email protected]> Jauhien Piatlicki <[email protected]>
314322
315323
Jeremy Letang <[email protected]>
324+
316325
Jeremy Sorensen <[email protected]>
317326
318327
@@ -336,6 +345,7 @@ John Kåre Alsaker <[email protected]>
336345
John Kåre Alsaker <[email protected]> <[email protected]>
337346
John Talling <[email protected]>
338347
John Van Enk <[email protected]>
348+
339349
Jonas Tepe <[email protected]>
340350
341351
Jonathan Chan Kwan Yin <[email protected]>
@@ -424,7 +434,7 @@ Malo Jaffré <[email protected]>
424434
Manish Goregaokar <[email protected]>
425435
426436
Marcell Pardavi <[email protected]>
427-
Marco Ieni <[email protected]>
437+
428438
Marcus Klaas de Vries <[email protected]>
429439
Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
430440
@@ -441,9 +451,10 @@ Martin Habovštiak <[email protected]>
441451
Martin Hafskjold Thoresen <[email protected]>
442452
443453
Matej Lach <[email protected]> Matej Ľach <[email protected]>
444-
Mateusz Mikuła <[email protected]>
445-
446-
454+
Mateusz Mikuła <[email protected]>
455+
456+
457+
447458
448459
Matthew Auld <[email protected]>
449460
Matthew Jasper <[email protected]>
@@ -531,6 +542,7 @@ Oliver Scherer <[email protected]> <[email protected]>
531542
532543
533544
Oliver Scherer <[email protected]>
545+
534546
535547
Onur Özkan <[email protected]>
536548
Ömer Sinan Ağacan <[email protected]>
@@ -588,9 +600,10 @@ Rui <[email protected]>
588600
Russell Johnston <[email protected]>
589601
Rustin-Liu <[email protected]>
590602
Rusty Blitzerr <[email protected]>
591-
RustyYato <krishna.sd.2012@gmail.com>
603+
RustyYato <rustyyato@gmail.com>
592604
Ruud van Asseldonk <[email protected]> Ruud van Asseldonk <[email protected]>
593605
Ryan Leung <[email protected]>
606+
594607
Ryan Scheel <[email protected]>
595608
Ryan Sullivant <[email protected]>
596609
Ryan Wiedemann <[email protected]>
@@ -686,6 +699,8 @@ Weihang Lo <[email protected]>
686699
687700
688701
whitequark <[email protected]>
702+
703+
689704
690705
691706
@@ -695,6 +710,8 @@ Xinye Tao <[email protected]>
695710
Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
696711
Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
697712
York Xiang <[email protected]>
713+
714+
698715
699716
700717
Youngsuk Kim <[email protected]>

0 commit comments

Comments
 (0)