Skip to content

Commit 0aa88ff

Browse files
gorentbarakgorentbarak
committed
Merge branch 'master' of https://github.com/rust-lang/rust 
2 parents 757dbba + beebcde commit 0aa88ff

File tree

4,812 files changed

+108956
-61094
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,812 files changed

+108956
-61094
lines changed

‎.github/workflows/ci.yml

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
os: ubuntu-20.04-4core-16gb
5858
env: {}
5959
- name: x86_64-gnu-llvm-15
60+
env:
61+
ENABLE_GCC_CODEGEN: "1"
6062
os: ubuntu-20.04-16core-64gb
61-
env: {}
6263
- name: x86_64-gnu-tools
6364
os: ubuntu-20.04-16core-64gb
6465
env: {}
@@ -93,6 +94,9 @@ jobs:
9394
- name: show the current environment
9495
run: src/ci/scripts/dump-environment.sh
9596
if: success() && !env.SKIP_JOB
97+
- name: install awscli
98+
run: src/ci/scripts/install-awscli.sh
99+
if: success() && !env.SKIP_JOB
96100
- name: install sccache
97101
run: src/ci/scripts/install-sccache.sh
98102
if: success() && !env.SKIP_JOB
@@ -102,6 +106,9 @@ jobs:
102106
- name: install clang
103107
run: src/ci/scripts/install-clang.sh
104108
if: success() && !env.SKIP_JOB
109+
- name: install tidy
110+
run: src/ci/scripts/install-tidy.sh
111+
if: success() && !env.SKIP_JOB
105112
- name: install WIX
106113
run: src/ci/scripts/install-wix.sh
107114
if: success() && !env.SKIP_JOB
@@ -190,8 +197,9 @@ jobs:
190197
os: ubuntu-20.04-8core-32gb
191198
env: {}
192199
- name: dist-aarch64-linux
200+
env:
201+
CODEGEN_BACKENDS: "llvm,cranelift"
193202
os: ubuntu-20.04-8core-32gb
194-
env: {}
195203
- name: dist-android
196204
os: ubuntu-20.04-8core-32gb
197205
env: {}
@@ -241,15 +249,18 @@ jobs:
241249
os: ubuntu-20.04-8core-32gb
242250
env: {}
243251
- name: dist-x86_64-linux
252+
env:
253+
CODEGEN_BACKENDS: "llvm,cranelift"
244254
os: ubuntu-20.04-16core-64gb
245-
env: {}
246255
- name: dist-x86_64-linux-alt
247256
env:
248257
IMAGE: dist-x86_64-linux
258+
CODEGEN_BACKENDS: "llvm,cranelift"
249259
os: ubuntu-20.04-16core-64gb
250260
- name: dist-x86_64-musl
261+
env:
262+
CODEGEN_BACKENDS: "llvm,cranelift"
251263
os: ubuntu-20.04-8core-32gb
252-
env: {}
253264
- name: dist-x86_64-netbsd
254265
os: ubuntu-20.04-8core-32gb
255266
env: {}
@@ -283,6 +294,10 @@ jobs:
283294
- name: x86_64-gnu-distcheck
284295
os: ubuntu-20.04-8core-32gb
285296
env: {}
297+
- name: x86_64-gnu-llvm-17
298+
env:
299+
RUST_BACKTRACE: 1
300+
os: ubuntu-20.04-8core-32gb
286301
- name: x86_64-gnu-llvm-16
287302
env:
288303
RUST_BACKTRACE: 1
@@ -309,6 +324,7 @@ jobs:
309324
NO_DEBUG_ASSERTIONS: 1
310325
NO_OVERFLOW_CHECKS: 1
311326
DIST_REQUIRE_ALL_TOOLS: 1
327+
CODEGEN_BACKENDS: "llvm,cranelift"
312328
os: macos-13
313329
- name: dist-apple-various
314330
env:
@@ -345,8 +361,8 @@ jobs:
345361
os: macos-13
346362
- name: dist-aarch64-apple
347363
env:
348-
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
349-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --disable-docs --set rust.jemalloc --set llvm.ninja=false"
364+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
365+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
350366
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
351367
SELECT_XCODE: /Applications/Xcode_13.4.1.app
352368
USE_XCODE_CLANG: 1
@@ -356,8 +372,20 @@ jobs:
356372
NO_DEBUG_ASSERTIONS: 1
357373
NO_OVERFLOW_CHECKS: 1
358374
DIST_REQUIRE_ALL_TOOLS: 1
359-
JEMALLOC_SYS_WITH_LG_PAGE: 14
360-
os: macos-13
375+
os: macos-13-xlarge
376+
- name: aarch64-apple
377+
env:
378+
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
379+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
380+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
381+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
382+
USE_XCODE_CLANG: 1
383+
MACOSX_DEPLOYMENT_TARGET: 11.0
384+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
385+
NO_LLVM_ASSERTIONS: 1
386+
NO_DEBUG_ASSERTIONS: 1
387+
NO_OVERFLOW_CHECKS: 1
388+
os: macos-13-xlarge
361389
- name: x86_64-msvc
362390
env:
363391
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -371,6 +399,7 @@ jobs:
371399
- name: x86_64-msvc-ext
372400
env:
373401
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
402+
HOST_TARGET: x86_64-pc-windows-msvc
374403
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json"
375404
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
376405
os: windows-2019-8core-32gb
@@ -458,6 +487,9 @@ jobs:
458487
- name: show the current environment
459488
run: src/ci/scripts/dump-environment.sh
460489
if: success() && !env.SKIP_JOB
490+
- name: install awscli
491+
run: src/ci/scripts/install-awscli.sh
492+
if: success() && !env.SKIP_JOB
461493
- name: install sccache
462494
run: src/ci/scripts/install-sccache.sh
463495
if: success() && !env.SKIP_JOB
@@ -467,6 +499,9 @@ jobs:
467499
- name: install clang
468500
run: src/ci/scripts/install-clang.sh
469501
if: success() && !env.SKIP_JOB
502+
- name: install tidy
503+
run: src/ci/scripts/install-tidy.sh
504+
if: success() && !env.SKIP_JOB
470505
- name: install WIX
471506
run: src/ci/scripts/install-wix.sh
472507
if: success() && !env.SKIP_JOB
@@ -545,8 +580,9 @@ jobs:
545580
matrix:
546581
include:
547582
- name: dist-x86_64-linux
583+
env:
584+
CODEGEN_BACKENDS: "llvm,cranelift"
548585
os: ubuntu-20.04-16core-64gb
549-
env: {}
550586
timeout-minutes: 600
551587
runs-on: "${{ matrix.os }}"
552588
steps:
@@ -578,6 +614,9 @@ jobs:
578614
- name: show the current environment
579615
run: src/ci/scripts/dump-environment.sh
580616
if: success() && !env.SKIP_JOB
617+
- name: install awscli
618+
run: src/ci/scripts/install-awscli.sh
619+
if: success() && !env.SKIP_JOB
581620
- name: install sccache
582621
run: src/ci/scripts/install-sccache.sh
583622
if: success() && !env.SKIP_JOB
@@ -587,6 +626,9 @@ jobs:
587626
- name: install clang
588627
run: src/ci/scripts/install-clang.sh
589628
if: success() && !env.SKIP_JOB
629+
- name: install tidy
630+
run: src/ci/scripts/install-tidy.sh
631+
if: success() && !env.SKIP_JOB
590632
- name: install WIX
591633
run: src/ci/scripts/install-wix.sh
592634
if: success() && !env.SKIP_JOB

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Alexis Beingessner <[email protected]>
3131
Alfie John <[email protected]> Alfie John <[email protected]>
3232
Alona Enraght-Moony <[email protected]> <[email protected]>
3333
Alona Enraght-Moony <[email protected]> <[email protected]>
34+
Amanda Stjerna <[email protected]> <[email protected]>
35+
Amanda Stjerna <[email protected]> <[email protected]>
3436
Amos Onn <[email protected]>
3537
Ana-Maria Mihalache <[email protected]>
3638
Anatoly Ikorsky <[email protected]>

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ standard library in the [Standard library developers Guide][std-dev-guide], comm
1515
## About the [rustc-dev-guide]
1616

1717
The [rustc-dev-guide] is meant to help document how rustc –the Rust compiler– works,
18-
as well as to help new contributors get involved in rustc development. It is recommend
18+
as well as to help new contributors get involved in rustc development. It is recommended
1919
to read and understand the [rustc-dev-guide] before making a contribution. This guide
2020
talks about the different bots in the Rust ecosystem, the Rust development tools,
2121
bootstrapping, the compiler architecture, source code representation, and more.

0 commit comments

Comments
 (0)