Skip to content

Commit 15b660f

Browse files
m-ou-sem-ou-se
committed
Merge remote-tracking branch 'origin/master' into atomic-from-mut
2 parents 7cc2569 + ac892a1 commit 15b660f

File tree

4,626 files changed

+231275
-219571
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,626 files changed

+231275
-219571
lines changed

‎.github/workflows/ci.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ jobs:
5959
uses: actions/checkout@v1
6060
with:
6161
fetch-depth: 2
62-
- name: configure GitHub Actions to kill the build when outdated
63-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
64-
with:
65-
github_token: "${{ secrets.github_token }}"
66-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
6762
- name: configure the PR in which the error message will be posted
6863
run: "echo \"[CI_PR_NUMBER=$num]\""
6964
env:
@@ -77,6 +72,11 @@ jobs:
7772
- name: decide whether to skip this job
7873
run: src/ci/scripts/should-skip-this.sh
7974
if: success() && !env.SKIP_JOB
75+
- name: configure GitHub Actions to kill the build when outdated
76+
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
77+
with:
78+
github_token: "${{ secrets.github_token }}"
79+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED"
8080
- name: collect CPU statistics
8181
run: src/ci/scripts/collect-cpu-stats.sh
8282
if: success() && !env.SKIP_JOB
@@ -163,11 +163,6 @@ jobs:
163163
uses: actions/checkout@v1
164164
with:
165165
fetch-depth: 2
166-
- name: configure GitHub Actions to kill the build when outdated
167-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
168-
with:
169-
github_token: "${{ secrets.github_token }}"
170-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
171166
- name: configure the PR in which the error message will be posted
172167
run: "echo \"[CI_PR_NUMBER=$num]\""
173168
env:
@@ -181,6 +176,11 @@ jobs:
181176
- name: decide whether to skip this job
182177
run: src/ci/scripts/should-skip-this.sh
183178
if: success() && !env.SKIP_JOB
179+
- name: configure GitHub Actions to kill the build when outdated
180+
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
181+
with:
182+
github_token: "${{ secrets.github_token }}"
183+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED"
184184
- name: collect CPU statistics
185185
run: src/ci/scripts/collect-cpu-stats.sh
186186
if: success() && !env.SKIP_JOB
@@ -364,9 +364,6 @@ jobs:
364364
- name: x86_64-gnu-distcheck
365365
os: ubuntu-latest-xl
366366
env: {}
367-
- name: x86_64-gnu-full-bootstrap
368-
os: ubuntu-latest-xl
369-
env: {}
370367
- name: x86_64-gnu-llvm-8
371368
env:
372369
RUST_BACKTRACE: 1
@@ -434,15 +431,15 @@ jobs:
434431
- name: x86_64-mingw-1
435432
env:
436433
SCRIPT: make ci-mingw-subset-1
437-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu"
434+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
438435
CUSTOM_MINGW: 1
439436
NO_DEBUG_ASSERTIONS: 1
440437
NO_LLVM_ASSERTIONS: 1
441438
os: windows-latest-xl
442439
- name: x86_64-mingw-2
443440
env:
444441
SCRIPT: make ci-mingw-subset-2
445-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu"
442+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
446443
CUSTOM_MINGW: 1
447444
os: windows-latest-xl
448445
- name: dist-x86_64-msvc
@@ -485,11 +482,6 @@ jobs:
485482
uses: actions/checkout@v1
486483
with:
487484
fetch-depth: 2
488-
- name: configure GitHub Actions to kill the build when outdated
489-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
490-
with:
491-
github_token: "${{ secrets.github_token }}"
492-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
493485
- name: configure the PR in which the error message will be posted
494486
run: "echo \"[CI_PR_NUMBER=$num]\""
495487
env:
@@ -503,6 +495,11 @@ jobs:
503495
- name: decide whether to skip this job
504496
run: src/ci/scripts/should-skip-this.sh
505497
if: success() && !env.SKIP_JOB
498+
- name: configure GitHub Actions to kill the build when outdated
499+
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
500+
with:
501+
github_token: "${{ secrets.github_token }}"
502+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED"
506503
- name: collect CPU statistics
507504
run: src/ci/scripts/collect-cpu-stats.sh
508505
if: success() && !env.SKIP_JOB
@@ -586,31 +583,34 @@ jobs:
586583
- name: dist-x86_64-apple
587584
env:
588585
SCRIPT: "./x.py dist"
589-
RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc"
586+
RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
590587
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
591588
MACOSX_DEPLOYMENT_TARGET: 10.7
592589
NO_LLVM_ASSERTIONS: 1
593590
NO_DEBUG_ASSERTIONS: 1
594591
DIST_REQUIRE_ALL_TOOLS: 1
592+
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
595593
os: macos-latest
596594
- name: dist-x86_64-apple-alt
597595
env:
598596
SCRIPT: "./x.py dist"
599-
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc"
597+
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
600598
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
601599
MACOSX_DEPLOYMENT_TARGET: 10.7
602600
NO_LLVM_ASSERTIONS: 1
603601
NO_DEBUG_ASSERTIONS: 1
602+
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
604603
os: macos-latest
605604
- name: x86_64-apple
606605
env:
607606
SCRIPT: "./x.py --stage 2 test"
608-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
607+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
609608
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
610609
MACOSX_DEPLOYMENT_TARGET: 10.8
611610
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
612611
NO_LLVM_ASSERTIONS: 1
613612
NO_DEBUG_ASSERTIONS: 1
613+
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
614614
os: macos-latest
615615
timeout-minutes: 600
616616
runs-on: "${{ matrix.os }}"
@@ -621,11 +621,6 @@ jobs:
621621
uses: actions/checkout@v1
622622
with:
623623
fetch-depth: 2
624-
- name: configure GitHub Actions to kill the build when outdated
625-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
626-
with:
627-
github_token: "${{ secrets.github_token }}"
628-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
629624
- name: configure the PR in which the error message will be posted
630625
run: "echo \"[CI_PR_NUMBER=$num]\""
631626
env:
@@ -639,6 +634,11 @@ jobs:
639634
- name: decide whether to skip this job
640635
run: src/ci/scripts/should-skip-this.sh
641636
if: success() && !env.SKIP_JOB
637+
- name: configure GitHub Actions to kill the build when outdated
638+
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
639+
with:
640+
github_token: "${{ secrets.github_token }}"
641+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED"
642642
- name: collect CPU statistics
643643
run: src/ci/scripts/collect-cpu-stats.sh
644644
if: success() && !env.SKIP_JOB

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
[submodule "src/llvm-project"]
3838
path = src/llvm-project
3939
url = https://github.com/rust-lang/llvm-project.git
40-
branch = rustc/10.0-2020-05-05
40+
branch = rustc/11.0-2020-08-20
4141
[submodule "src/doc/embedded-book"]
4242
path = src/doc/embedded-book
4343
url = https://github.com/rust-embedded/book.git

‎.mailmap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
176176
Markus Westerlind <[email protected]> Markus <[email protected]>
177177
Martin Hafskjold Thoresen <[email protected]>
178178
Matej Lach <[email protected]> Matej Ľach <[email protected]>
179-
Mateusz Mikuła <[email protected]> <mati865@gmail.com>
180-
Mateusz Mikuła <[email protected]> <[email protected]>
179+
Mateusz Mikuła <[email protected]> <mati865@users.noreply.github.com>
180+
Mateusz Mikuła <[email protected]> <[email protected]>
181181
Matt Brubeck <[email protected]> <[email protected]>
182182
Matthew Auld <[email protected]>
183183
Matthew Kraai <[email protected]>

0 commit comments

Comments
 (0)