Merge pull request rust-lang#18566 from lnicola/sync-from-rust

minor: Sync from downstream

Author: lnicola

.github/ISSUE_TEMPLATE/tracking_issue.md

@@ -46,7 +46,7 @@ for larger features an implementation could be broken up into multiple PRs.
 
 [stabilization-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#stabilization-pr
 [doc-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#documentation-prs
-[nightly-style-procedure]: https://github.com/rust-lang/style-team/blob/master/nightly-style-procedure.md 
+[nightly-style-procedure]: https://github.com/rust-lang/style-team/blob/main/nightly-style-procedure.md 
 [Style Guide]: https://github.com/rust-lang/rust/tree/master/src/doc/style-guide
 
 ### Unresolved Questions

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
     defaults:
       run:
         shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
-    timeout-minutes: 240
+    timeout-minutes: 360
     env:
       CI_JOB_NAME: ${{ matrix.image }}
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
@@ -110,11 +110,7 @@ jobs:
       # less disk space.
       - name: free up disk space
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
-        if: contains(matrix.os, 'ubuntu')
-        with:
-          # Removing packages with APT saves ~5 GiB, but takes several
-          # minutes (and potentially removes important packages).
-          large-packages: false
+        if: matrix.free_disk
 
       # Rust Log Analyzer can't currently detect the PR number of a GitHub
       # Actions build on its own, so a hint in the log message is needed to

.mailmap

@@ -31,6 +31,7 @@ Alexis Beingessner <[email protected]>
 Alfie John <[email protected]> Alfie John <[email protected]>
 Alona Enraght-Moony <[email protected]> <[email protected]>
 Alona Enraght-Moony <[email protected]> <[email protected]>
+Alona Enraght-Moony <[email protected]> <[email protected]>
 Amanda Stjerna <[email protected]> <[email protected]>
 Amanda Stjerna <[email protected]> <[email protected]>
 Amos Onn <[email protected]>
@@ -75,6 +76,7 @@ Benjamin Jackman <[email protected]>
 Benoît Cortier <[email protected]>
 Bheesham Persaud <[email protected]> Bheesham Persaud <[email protected]>
 bjorn3 <[email protected]> <[email protected]>
+bjorn3 <[email protected]> <[email protected]>
 Björn Steinbrink <[email protected]> <[email protected]>
 blake2-ppc <[email protected]> <blake2-ppc>
 blyxyas <[email protected]> Alejandra González <[email protected]>
@@ -172,6 +174,7 @@ Dzmitry Malyshau <[email protected]>
 E. Dunham <[email protected]> edunham <[email protected]>
 Ed Barnard <[email protected]>
 Eduard-Mihai Burtescu <[email protected]>
+Eduard-Mihai Burtescu <[email protected]> <[email protected]>
 Eduardo Bautista <[email protected]> <=>
 Eduardo Bautista <[email protected]> <[email protected]>
 Eduardo Broto <[email protected]>
@@ -186,6 +189,7 @@ Erick Tryzelaar <[email protected]> <[email protected]>
 Erik Desjardins <[email protected]>
 Erik Jensen <[email protected]>
 Erin Power <[email protected]>
+Erin Power <[email protected]> <[email protected]>
 Erin Power <[email protected]> <[email protected]>
 Erin Power <[email protected]> <[email protected]>
 Esteban Küber <[email protected]>
@@ -198,6 +202,7 @@ F001 <[email protected]>
 Fabian Kössel <[email protected]>
 Falco Hirschenberger <[email protected]> <[email protected]>
 Felix S. Klock II <[email protected]> Felix S Klock II <[email protected]>
+Felix S. Klock II <[email protected]> <[email protected]>
 Félix Saparelli <[email protected]>
 Flaper Fesp <[email protected]>
 Florian Berger <[email protected]>
@@ -245,7 +250,7 @@ Irina Popa <[email protected]>
 Ivan Ivaschenko <[email protected]>
 ivan tkachenko <[email protected]>
 J. J. Weber <[email protected]>
-Jack Huey <[email protected]>
+Jack Huey <[email protected]> <[email protected]>
 Jacob <[email protected]>
 Jacob Greenfield <[email protected]>
 Jacob Pratt <[email protected]> <[email protected]>
@@ -292,6 +297,7 @@ John Clements <[email protected]> <[email protected]>
 John Hodge <[email protected]> John Hodge <[email protected]>
 John Hörnvall <[email protected]>
 John Kåre Alsaker <[email protected]>
+John Kåre Alsaker <[email protected]> <[email protected]>
 John Talling <[email protected]>
 John Van Enk <[email protected]>
 Jonas Tepe <[email protected]>
@@ -368,6 +374,7 @@ Lukas Lueg <[email protected]>
 Luke Metz <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
+Luqman Aden <[email protected]> <[email protected]>
 Lzu Tao <[email protected]>
 Maik Klein <[email protected]>
 Malo Jaffré <[email protected]>
@@ -409,6 +416,7 @@ mental <[email protected]>
 mibac138 <[email protected]>
 Michael Williams <[email protected]>
 Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
+Michael Woerister <michaelwoerister@posteo> <[email protected]>
 Michael Woerister <michaelwoerister@posteo> <[email protected]>
 Michael Woerister <michaelwoerister@posteo> <[email protected]>
 Michael Zhang <[email protected]>
@@ -422,6 +430,7 @@ Ms2ger <[email protected]> <[email protected]>
 msizanoen1 <[email protected]>
 Mukilan Thiagarajan <[email protected]>
 Nadrieril Feneanar <[email protected]>
+Nadrieril Feneanar <[email protected]> <[email protected]>
 NAKASHIMA, Makoto <[email protected]> <[email protected]>
 NAKASHIMA, Makoto <[email protected]> <[email protected]>
 Nathan Ringo <[email protected]>
@@ -442,6 +451,8 @@ Niclas Schwarzlose <[email protected]>
 Nicolas Abram <[email protected]>
 Nicole Mazzuca <[email protected]>
 Noratrieb <[email protected]> <[email protected]>
+Noratrieb <[email protected]> <[email protected]>
+Noratrieb <[email protected]> <[email protected]>
 Nif Ward <[email protected]>
 Nika Layzell <[email protected]> <[email protected]>
 NODA Kai <[email protected]>
@@ -460,6 +471,7 @@ Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]>
 Onur Özkan <[email protected]> <[email protected]>
 Onur Özkan <[email protected]>
@@ -496,6 +508,7 @@ Raphaël Huchet <[email protected]>
 rChaser53 <[email protected]>
 Rémy Rakic <[email protected]>
 Rémy Rakic <[email protected]> <[email protected]>
+Rémy Rakic <[email protected]> <[email protected]>
 Renato Riccieri Santos Zannon <[email protected]>
 Richard Diamond <[email protected]> <[email protected]>
 Ricky Hosfelt <[email protected]>
@@ -525,6 +538,7 @@ Samuel Tardieu <[email protected]>
 Santiago Pastorino <[email protected]>
 Santiago Pastorino <[email protected]> <[email protected]>
 Scott McMurray <[email protected]>
+Scott McMurray <[email protected]> <[email protected]>
 Scott Olson <[email protected]> Scott Olson <[email protected]>
 Sean Gillespie <[email protected]> swgillespie <[email protected]>
 Seiichi Uchida <[email protected]>
@@ -536,6 +550,7 @@ Shyam Sundar B <[email protected]>
 Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
 Simon Sapin <[email protected]> <[email protected]>
 Simonas Kazlauskas <[email protected]> Simonas Kazlauskas <[email protected]>
+Simonas Kazlauskas <[email protected]> <[email protected]>
 Siva Prasad <[email protected]>
 Smittyvb <[email protected]>
 Srinivas Reddy Thatiparthy <[email protected]>
@@ -556,6 +571,8 @@ Tatsuyuki Ishi <[email protected]>
 Tau Gärtli <[email protected]> <[email protected]>
 Tero Hänninen <[email protected]> Tero Hänninen <[email protected]>
 The8472 <[email protected]>
+The8472 <[email protected]> <[email protected]>
+The8472 <[email protected]> <[email protected]>
 Theo Belaire <[email protected]> Theo Belaire <[email protected]>
 Theodore Luo Wang <[email protected]>
 Thiago Pontes <[email protected]> thiagopnts <[email protected]>
@@ -593,7 +610,8 @@ Waffle Lapkin <[email protected]>
 Wesley Wiser <[email protected]> <[email protected]>
 whitequark <[email protected]>
 William Ting <[email protected]> <[email protected]>
-Wim Looman <[email protected]>
+Wim Looman <[email protected]> <[email protected]>
+Wim Looman <[email protected]> <[email protected]>
 Without Boats <[email protected]>
 Without Boats <[email protected]> <[email protected]>
 Xinye Tao <[email protected]>

COPYRIGHT

@@ -343,49 +343,42 @@ their own copyright notices and license terms:
 * Portions of internationalization code use code or data from Unicode, which
   carry the following license:
 
-      UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-    See Terms of Use <https://www.unicode.org/copyright.html>
-    for definitions of Unicode Inc.’s Data Files and Software.
-
-    NOTICE TO USER: Carefully read the following legal agreement.
-    BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-    DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-    YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-    TERMS AND CONDITIONS OF THIS AGREEMENT.
-    IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-    THE DATA FILES OR SOFTWARE.
+    UNICODE LICENSE V3
 
     COPYRIGHT AND PERMISSION NOTICE
 
-    Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-    Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of the Unicode data files and any associated documentation
-    (the "Data Files") or Unicode software and any associated documentation
-    (the "Software") to deal in the Data Files or Software
-    without restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, and/or sell copies of
-    the Data Files or Software, and to permit persons to whom the Data Files
-    or Software are furnished to do so, provided that either
-    (a) this copyright and permission notice appear with all copies
-    of the Data Files or Software, or
-    (b) this copyright and permission notice appear in associated
-    Documentation.
-
-    THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-    ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-    WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-    IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-    NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-    DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-    DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-    TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-    Except as contained in this notice, the name of a copyright holder
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in these Data Files or Software without prior
-    written authorization of the copyright holder.
+    Copyright © 1991-2024 Unicode, Inc.
+
+    NOTICE TO USER: Carefully read the following legal agreement. BY
+    DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+    SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+    TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+    DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of data files and any associated documentation (the "Data Files") or
+    software and any associated documentation (the "Software") to deal in the
+    Data Files or Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, and/or sell
+    copies of the Data Files or Software, and to permit persons to whom the
+    Data Files or Software are furnished to do so, provided that either (a)
+    this copyright and permission notice appear with all copies of the Data
+    Files or Software, or (b) this copyright and permission notice appear in
+    associated Documentation.
+
+    THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+    KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+    THIRD PARTY RIGHTS.
+
+    IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+    BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+    OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+    WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+    FILES OR SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder shall
+    not be used in advertising or otherwise to promote the sale, use or other
+    dealings in these Data Files or Software without prior written
+    authorization of the copyright holder.