Skip to content

Commit 010891f

Browse files
jonhoojonhoo
committed
Merge branch 'master' into stabilize-vecdeque-make_contiguous
2 parents 2f96ce8 + e88e908 commit 010891f

File tree

4,316 files changed

+250855
-235681
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,316 files changed

+250855
-235681
lines changed

‎.github/workflows/ci.yml

+34-28
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
@@ -406,7 +403,7 @@ jobs:
406403
os: windows-latest-xl
407404
- name: x86_64-msvc-cargo
408405
env:
409-
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
406+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
410407
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
411408
VCVARS_BAT: vcvars64.bat
412409
NO_DEBUG_ASSERTIONS: 1
@@ -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
@@ -575,36 +572,45 @@ jobs:
575572
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
576573
if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
577574
strategy:
575+
fail-fast: false
578576
matrix:
579577
include:
578+
- name: aarch64-gnu
579+
os:
580+
- self-hosted
581+
- ARM64
582+
- linux
580583
- name: dist-x86_64-apple
581584
env:
582585
SCRIPT: "./x.py dist"
583-
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"
584587
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
585588
MACOSX_DEPLOYMENT_TARGET: 10.7
586589
NO_LLVM_ASSERTIONS: 1
587590
NO_DEBUG_ASSERTIONS: 1
588591
DIST_REQUIRE_ALL_TOOLS: 1
592+
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
589593
os: macos-latest
590594
- name: dist-x86_64-apple-alt
591595
env:
592596
SCRIPT: "./x.py dist"
593-
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"
594598
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
595599
MACOSX_DEPLOYMENT_TARGET: 10.7
596600
NO_LLVM_ASSERTIONS: 1
597601
NO_DEBUG_ASSERTIONS: 1
602+
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
598603
os: macos-latest
599604
- name: x86_64-apple
600605
env:
601-
SCRIPT: "./x.py test"
602-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
606+
SCRIPT: "./x.py --stage 2 test"
607+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
603608
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
604609
MACOSX_DEPLOYMENT_TARGET: 10.8
605610
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
606611
NO_LLVM_ASSERTIONS: 1
607612
NO_DEBUG_ASSERTIONS: 1
613+
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
608614
os: macos-latest
609615
timeout-minutes: 600
610616
runs-on: "${{ matrix.os }}"
@@ -615,11 +621,6 @@ jobs:
615621
uses: actions/checkout@v1
616622
with:
617623
fetch-depth: 2
618-
- name: configure GitHub Actions to kill the build when outdated
619-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
620-
with:
621-
github_token: "${{ secrets.github_token }}"
622-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
623624
- name: configure the PR in which the error message will be posted
624625
run: "echo \"[CI_PR_NUMBER=$num]\""
625626
env:
@@ -633,6 +634,11 @@ jobs:
633634
- name: decide whether to skip this job
634635
run: src/ci/scripts/should-skip-this.sh
635636
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"
636642
- name: collect CPU statistics
637643
run: src/ci/scripts/collect-cpu-stats.sh
638644
if: success() && !env.SKIP_JOB

‎.gitmodules

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,13 @@
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
4444
[submodule "src/tools/rust-analyzer"]
4545
path = src/tools/rust-analyzer
4646
url = https://github.com/rust-analyzer/rust-analyzer.git
47+
[submodule "library/backtrace"]
48+
path = library/backtrace
49+
url = https://github.com/rust-lang/backtrace-rs.git

‎.mailmap

+2-2
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)