Skip to content

Commit 17a7ccc

Browse files
LittleFallLittleFall
committed
Merge branch 'master' into enhance/warning
2 parents 9b27e4e + fcdbd1c commit 17a7ccc

File tree

3,730 files changed

+80354
-49331
lines changed

Some content is hidden

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

3,730 files changed

+80354
-49331
lines changed

‎.github/ISSUE_TEMPLATE/ice.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
name: Internal Compiler Error
3+
about: Create a report for an internal compiler error in rustc.
4+
labels: C-bug, I-ICE, T-compiler
5+
---
6+
<!--
7+
Thank you for finding an Internal Compiler Error! 🧊 If possible, try to provide
8+
a minimal verifiable example. You can read "Rust Bug Minimization Patterns" for
9+
how to create smaller examples.
10+
http://blog.pnkfx.org/blog/2019/11/18/rust-bug-minimization-patterns/
11+
-->
12+
13+
### Code
14+
15+
```Rust
16+
<code>
17+
```
18+
19+
20+
### Meta
21+
<!--
22+
If you're using the stable version of the compiler, you should also check if the
23+
bug also exists in the beta or nightly versions.
24+
-->
25+
26+
`rustc --version --verbose`:
27+
```
28+
<version>
29+
```
30+
31+
### Error output
32+
33+
```
34+
<output>
35+
```
36+
37+
<!--
38+
Include a backtrace in the code block by setting `RUST_BACKTRACE=1` in your
39+
environment. E.g. `RUST_BACKTRACE=1 cargo build`.
40+
-->
41+
<details><summary><strong>Backtrace</strong></summary>
42+
<p>
43+
44+
```
45+
<backtrace>
46+
```
47+
48+
</p>
49+
</details>

‎.github/ISSUE_TEMPLATE/ice.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Internal Compiler Error
2-
description: Create a report for an internal compiler error in `rustc`
1+
name: Internal Compiler Error (for use by automated tooling)
2+
description: For now, you'll want to use the other ICE template, as GitHub forms have strict limits on the size of fields so backtraces cannot be pasted directly.
33
labels: ["C-bug", "I-ICE", "T-compiler"]
44
title: "[ICE]: "
55
body:
@@ -79,4 +79,4 @@ body:
7979
label: Anything else?
8080
description: If you have more details you want to give us to reproduce this issue, please add it here
8181
validations:
82-
required: false
82+
required: false

‎.github/workflows/ci.yml

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
name: PR
3838
env:
3939
CI_JOB_NAME: "${{ matrix.name }}"
40+
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
4041
SCCACHE_BUCKET: rust-lang-ci-sccache2
4142
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
4243
CACHE_DOMAIN: ci-caches.rust-lang.org
@@ -53,15 +54,14 @@ jobs:
5354
tidy: true
5455
os: ubuntu-20.04-xl
5556
env: {}
56-
- name: x86_64-gnu-llvm-13
57+
- name: x86_64-gnu-llvm-14
5758
tidy: false
5859
os: ubuntu-20.04-xl
5960
env: {}
6061
- name: x86_64-gnu-tools
6162
tidy: false
62-
env:
63-
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
6463
os: ubuntu-20.04-xl
64+
env: {}
6565
timeout-minutes: 600
6666
runs-on: "${{ matrix.os }}"
6767
steps:
@@ -162,6 +162,7 @@ jobs:
162162
name: auto
163163
env:
164164
CI_JOB_NAME: "${{ matrix.name }}"
165+
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
165166
SCCACHE_BUCKET: rust-lang-ci-sccache2
166167
DEPLOY_BUCKET: rust-lang-ci2
167168
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
@@ -291,11 +292,15 @@ jobs:
291292
- name: x86_64-gnu-distcheck
292293
os: ubuntu-20.04-xl
293294
env: {}
294-
- name: x86_64-gnu-llvm-13
295+
- name: x86_64-gnu-llvm-15
296+
env:
297+
RUST_BACKTRACE: 1
298+
os: ubuntu-20.04-xl
299+
- name: x86_64-gnu-llvm-14
295300
env:
296301
RUST_BACKTRACE: 1
297302
os: ubuntu-20.04-xl
298-
- name: x86_64-gnu-llvm-13-stage1
303+
- name: x86_64-gnu-llvm-14-stage1
299304
env:
300305
RUST_BACKTRACE: 1
301306
os: ubuntu-20.04-xl
@@ -317,7 +322,7 @@ jobs:
317322
NO_DEBUG_ASSERTIONS: 1
318323
NO_OVERFLOW_CHECKS: 1
319324
DIST_REQUIRE_ALL_TOOLS: 1
320-
os: macos-12-xl
325+
os: macos-latest
321326
- name: dist-apple-various
322327
env:
323328
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -328,7 +333,7 @@ jobs:
328333
NO_LLVM_ASSERTIONS: 1
329334
NO_DEBUG_ASSERTIONS: 1
330335
NO_OVERFLOW_CHECKS: 1
331-
os: macos-12-xl
336+
os: macos-latest
332337
- name: dist-x86_64-apple-alt
333338
env:
334339
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -339,7 +344,7 @@ jobs:
339344
NO_LLVM_ASSERTIONS: 1
340345
NO_DEBUG_ASSERTIONS: 1
341346
NO_OVERFLOW_CHECKS: 1
342-
os: macos-12-xl
347+
os: macos-latest
343348
- name: x86_64-apple-1
344349
env:
345350
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -350,7 +355,7 @@ jobs:
350355
NO_LLVM_ASSERTIONS: 1
351356
NO_DEBUG_ASSERTIONS: 1
352357
NO_OVERFLOW_CHECKS: 1
353-
os: macos-12-xl
358+
os: macos-latest
354359
- name: x86_64-apple-2
355360
env:
356361
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -361,7 +366,7 @@ jobs:
361366
NO_LLVM_ASSERTIONS: 1
362367
NO_DEBUG_ASSERTIONS: 1
363368
NO_OVERFLOW_CHECKS: 1
364-
os: macos-12-xl
369+
os: macos-latest
365370
- name: dist-aarch64-apple
366371
env:
367372
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -376,7 +381,7 @@ jobs:
376381
NO_OVERFLOW_CHECKS: 1
377382
DIST_REQUIRE_ALL_TOOLS: 1
378383
JEMALLOC_SYS_WITH_LG_PAGE: 14
379-
os: macos-12-xl
384+
os: macos-latest
380385
- name: x86_64-msvc-1
381386
env:
382387
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -410,36 +415,36 @@ jobs:
410415
os: windows-latest-xl
411416
- name: i686-mingw-1
412417
env:
413-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --set llvm.allow-old-toolchain"
418+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
414419
SCRIPT: make ci-mingw-subset-1
415420
NO_DOWNLOAD_CI_LLVM: 1
416421
CUSTOM_MINGW: 1
417422
os: windows-latest-xl
418423
- name: i686-mingw-2
419424
env:
420-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --set llvm.allow-old-toolchain"
425+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
421426
SCRIPT: make ci-mingw-subset-2
422427
NO_DOWNLOAD_CI_LLVM: 1
423428
CUSTOM_MINGW: 1
424429
os: windows-latest-xl
425430
- name: x86_64-mingw-1
426431
env:
427432
SCRIPT: make ci-mingw-subset-1
428-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
433+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
429434
NO_DOWNLOAD_CI_LLVM: 1
430435
CUSTOM_MINGW: 1
431436
os: windows-latest-xl
432437
- name: x86_64-mingw-2
433438
env:
434439
SCRIPT: make ci-mingw-subset-2
435-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
440+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
436441
NO_DOWNLOAD_CI_LLVM: 1
437442
CUSTOM_MINGW: 1
438443
os: windows-latest-xl
439444
- name: dist-x86_64-msvc
440445
env:
441446
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler --set rust.lto=thin"
442-
SCRIPT: PGO_HOST=x86_64-pc-windows-msvc src/ci/pgo.sh python x.py dist bootstrap --include-default-paths
447+
SCRIPT: PGO_HOST=x86_64-pc-windows-msvc python src/ci/stage-build.py python x.py dist bootstrap --include-default-paths
443448
DIST_REQUIRE_ALL_TOOLS: 1
444449
os: windows-latest-xl
445450
- name: dist-i686-msvc
@@ -457,7 +462,7 @@ jobs:
457462
os: windows-latest-xl
458463
- name: dist-i686-mingw
459464
env:
460-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
465+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
461466
NO_DOWNLOAD_CI_LLVM: 1
462467
SCRIPT: python x.py dist bootstrap --include-default-paths
463468
CUSTOM_MINGW: 1
@@ -466,7 +471,7 @@ jobs:
466471
- name: dist-x86_64-mingw
467472
env:
468473
SCRIPT: python x.py dist bootstrap --include-default-paths
469-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
474+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
470475
NO_DOWNLOAD_CI_LLVM: 1
471476
CUSTOM_MINGW: 1
472477
DIST_REQUIRE_ALL_TOOLS: 1
@@ -576,6 +581,7 @@ jobs:
576581
name: try
577582
env:
578583
CI_JOB_NAME: "${{ matrix.name }}"
584+
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
579585
SCCACHE_BUCKET: rust-lang-ci-sccache2
580586
DEPLOY_BUCKET: rust-lang-ci2
581587
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"

‎.mailmap

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Adrien Tétar <[email protected]>
1515
Ahmed Charles <[email protected]> <[email protected]>
1616
Alan Egerton <[email protected]>
1717
Alan Stoate <[email protected]>
18+
Albert Larsan <[email protected]> Albert Larsan <[email protected]>
1819
Alessandro Decina <[email protected]>
1920
Alex Burka <[email protected]> Alex Burka <[email protected]>
2021
Alex Hansen <[email protected]>
@@ -165,6 +166,7 @@ Eduard-Mihai Burtescu <[email protected]>
165166
Eduardo Bautista <[email protected]> <=>
166167
Eduardo Bautista <[email protected]> <[email protected]>
167168
Eduardo Broto <[email protected]>
169+
Edward Shen <[email protected]> <[email protected]>
168170
Elliott Slaughter <[email protected]> <[email protected]>
169171
Elly Fong-Jones <[email protected]>
170172
Eric Holk <[email protected]> <[email protected]>
@@ -324,6 +326,7 @@ Lennart Kudling <[email protected]>
324326
Léo Lanteri Thauvin <[email protected]>
325327
Léo Lanteri Thauvin <[email protected]> <[email protected]>
326328
Léo Testard <[email protected]>
329+
León Orell Valerian Liehr <[email protected]> <[email protected]>
327330
Leonardo Yvens <[email protected]>
328331
Liigo Zhuang <[email protected]>
329332
Lily Ballard <[email protected]> <[email protected]>
@@ -416,18 +419,18 @@ Nixon Enraght-Moony <[email protected]>
416419
NODA Kai <[email protected]>
417420
oliver <[email protected]>
418421
Oliver Middleton <[email protected]> <[email protected]>
419-
Oliver Scherer <[email protected]> <[email protected]>
420-
Oliver Scherer <[email protected]> <[email protected]>
421-
Oliver Scherer <[email protected]> <[email protected]>
422-
Oliver Scherer <[email protected]> <[email protected]>
423-
Oliver Scherer <[email protected]> <[email protected]>
424-
Oliver Scherer <[email protected]> <[email protected]>
425-
Oliver Scherer <[email protected]> <[email protected]>
426-
Oliver Scherer <[email protected]> <[email protected]>
427-
Oliver Scherer <[email protected]> <[email protected]>
428-
Oliver Scherer <[email protected]> <public.[email protected]>
429-
Oliver Scherer <[email protected]> <[email protected]>
430-
Oliver Scherer <[email protected]>
422+
Oliver Scherer <[email protected]> <[email protected]>
423+
Oliver Scherer <[email protected]> <[email protected]>
424+
Oliver Scherer <[email protected]> <[email protected]>
425+
Oliver Scherer <[email protected]> <[email protected]>
426+
Oliver Scherer <[email protected]> <[email protected]>
427+
Oliver Scherer <[email protected]> <[email protected]>
428+
Oliver Scherer <[email protected]> <[email protected]>
429+
Oliver Scherer <[email protected]> <[email protected]>
430+
Oliver Scherer <[email protected]> <[email protected]>
431+
Oliver Scherer <[email protected]> <[email protected]>
432+
Oliver Scherer <[email protected]> <[email protected]>
433+
Oliver Scherer <[email protected]>
431434
Ömer Sinan Ağacan <[email protected]>
432435
Ophir LOJKINE <[email protected]>
433436
Ožbolt Menegatti <[email protected]> gareins <[email protected]>

0 commit comments

Comments
 (0)