Skip to content

Commit d2757a2

Browse files
authored
Merge branch 'master' into issue-83060-fix
2 parents 4f5a1cd + 0aeaa5e commit d2757a2

File tree

6,667 files changed

+136876
-72773
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,667 files changed

+136876
-72773
lines changed

.github/ISSUE_TEMPLATE/tracking_issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ for larger features an implementation could be broken up into multiple PRs.
4646

4747
[stabilization-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#stabilization-pr
4848
[doc-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#documentation-prs
49-
[nightly-style-procedure]: https://github.com/rust-lang/style-team/blob/master/nightly-style-procedure.md
49+
[nightly-style-procedure]: https://github.com/rust-lang/style-team/blob/main/nightly-style-procedure.md
5050
[Style Guide]: https://github.com/rust-lang/rust/tree/master/src/doc/style-guide
5151

5252
### Unresolved Questions

.github/renovate.json5

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
// Let Renovatebot keep an opened issue that tracks our dependencies
4+
"dependencyDashboard": true,
5+
// Disable "normal" package updates
6+
"enabledManagers": [],
7+
// Update lockfiles once per week
8+
"lockFileMaintenance": {
9+
"enabled": true,
10+
"schedule": [
11+
"before 5am on Tuesday"
12+
]
13+
}
14+
}

.github/workflows/ci.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
defaults:
6666
run:
6767
shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
68-
timeout-minutes: 240
68+
timeout-minutes: 360
6969
env:
7070
CI_JOB_NAME: ${{ matrix.image }}
7171
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
@@ -110,11 +110,7 @@ jobs:
110110
# less disk space.
111111
- name: free up disk space
112112
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
113-
if: contains(matrix.os, 'ubuntu')
114-
with:
115-
# Removing packages with APT saves ~5 GiB, but takes several
116-
# minutes (and potentially removes important packages).
117-
large-packages: false
113+
if: matrix.free_disk
118114

119115
# Rust Log Analyzer can't currently detect the PR number of a GitHub
120116
# Actions build on its own, so a hint in the log message is needed to

.gitignore

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ no_llvm_build
4646
/inst/
4747
/llvm/
4848
/mingw-build/
49-
build/
50-
!/compiler/rustc_mir_build/src/build/
49+
/build
5150
/build-rust-analyzer/
5251
/dist/
5352
/unicode-downloads
@@ -89,12 +88,12 @@ package.json
8988
tests/rustdoc-gui/src/**.lock
9089

9190
## direnv
92-
.envrc
93-
.direnv/
91+
/.envrc
92+
/.direnv/
9493

9594
## nix
96-
flake.nix
95+
/flake.nix
9796
flake.lock
98-
default.nix
97+
/default.nix
9998

10099
# Before adding new lines, see the comment at the top.

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
3535
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/19.1-2024-09-17
36+
branch = rustc/19.1-2024-12-03
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ Jack Huey <[email protected]> <[email protected]>
254254
255255
Jacob Greenfield <[email protected]>
256256
257+
257258
Jake Vossen <[email protected]>
258259
259260
Jakob Lautrup Nysom <[email protected]>

COPYRIGHT

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -343,49 +343,42 @@ their own copyright notices and license terms:
343343
* Portions of internationalization code use code or data from Unicode, which
344344
carry the following license:
345345

346-
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
347-
348-
See Terms of Use <https://www.unicode.org/copyright.html>
349-
for definitions of Unicode Inc.’s Data Files and Software.
350-
351-
NOTICE TO USER: Carefully read the following legal agreement.
352-
BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
353-
DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
354-
YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
355-
TERMS AND CONDITIONS OF THIS AGREEMENT.
356-
IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
357-
THE DATA FILES OR SOFTWARE.
346+
UNICODE LICENSE V3
358347

359348
COPYRIGHT AND PERMISSION NOTICE
360349

361-
Copyright © 1991-2022 Unicode, Inc. All rights reserved.
362-
Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
363-
364-
Permission is hereby granted, free of charge, to any person obtaining
365-
a copy of the Unicode data files and any associated documentation
366-
(the "Data Files") or Unicode software and any associated documentation
367-
(the "Software") to deal in the Data Files or Software
368-
without restriction, including without limitation the rights to use,
369-
copy, modify, merge, publish, distribute, and/or sell copies of
370-
the Data Files or Software, and to permit persons to whom the Data Files
371-
or Software are furnished to do so, provided that either
372-
(a) this copyright and permission notice appear with all copies
373-
of the Data Files or Software, or
374-
(b) this copyright and permission notice appear in associated
375-
Documentation.
376-
377-
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
378-
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
379-
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
380-
NONINFRINGEMENT OF THIRD PARTY RIGHTS.
381-
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
382-
NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
383-
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
384-
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
385-
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
386-
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
387-
388-
Except as contained in this notice, the name of a copyright holder
389-
shall not be used in advertising or otherwise to promote the sale,
390-
use or other dealings in these Data Files or Software without prior
391-
written authorization of the copyright holder.
350+
Copyright © 1991-2024 Unicode, Inc.
351+
352+
NOTICE TO USER: Carefully read the following legal agreement. BY
353+
DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
354+
SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
355+
TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
356+
DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
357+
358+
Permission is hereby granted, free of charge, to any person obtaining a
359+
copy of data files and any associated documentation (the "Data Files") or
360+
software and any associated documentation (the "Software") to deal in the
361+
Data Files or Software without restriction, including without limitation
362+
the rights to use, copy, modify, merge, publish, distribute, and/or sell
363+
copies of the Data Files or Software, and to permit persons to whom the
364+
Data Files or Software are furnished to do so, provided that either (a)
365+
this copyright and permission notice appear with all copies of the Data
366+
Files or Software, or (b) this copyright and permission notice appear in
367+
associated Documentation.
368+
369+
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
370+
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
371+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
372+
THIRD PARTY RIGHTS.
373+
374+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
375+
BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
376+
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
377+
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
378+
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
379+
FILES OR SOFTWARE.
380+
381+
Except as contained in this notice, the name of a copyright holder shall
382+
not be used in advertising or otherwise to promote the sale, use or other
383+
dealings in these Data Files or Software without prior written
384+
authorization of the copyright holder.

0 commit comments

Comments
 (0)