Skip to content

Commit 63ca028

Browse files
committed
Auto merge of rust-lang#75261 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] backports * Forbid non-derefable types explicitly in unsizing casts rust-lang#75136 * forbid `#[track_caller]` on main rust-lang#75130 * Fix #[track_caller] shims for trait objects. rust-lang#74784 * rustc_target: Add a target spec option for disabling `--eh-frame-hdr` rust-lang#74631 * Disable Azure Pipelines except for macOS rust-lang#74620 * Upload builds from GHA instead of Azure Pipelines rust-lang#74565 * Add the aarch64-apple-darwin target rust-lang#74541 * Use `ReEmpty(U0)` as the implicit region bound in typeck rust-lang#74509 * rustbuild: drop tool::should_install rust-lang#74457 * lint: use `transparent_newtype_field` to avoid ICE rust-lang#74340 * Don't panic if the lhs of a div by zero is not statically known rust-lang#74221 * improper_ctypes_definitions: allow `Box` rust-lang#74448 * typeck: check for infer before type impls trait rust-lang#73965
2 parents 6f95990 + ed591d0 commit 63ca028

Some content is hidden

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

51 files changed

+526
-464
lines changed

Diff for: .github/workflows/ci.yml

+44-24
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
name: PR
3333
env:
3434
CI_JOB_NAME: "${{ matrix.name }}"
35-
SCCACHE_BUCKET: rust-lang-gha-caches
36-
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
37-
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
35+
SCCACHE_BUCKET: rust-lang-ci-sccache2
36+
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
37+
CACHE_DOMAIN: ci-caches.rust-lang.org
3838
if: "github.event_name == 'pull_request'"
3939
strategy:
4040
matrix:
@@ -63,6 +63,11 @@ jobs:
6363
with:
6464
github_token: "${{ secrets.github_token }}"
6565
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
66+
- name: configure the PR in which the error message will be posted
67+
run: "echo \"[CI_PR_NUMBER=$num]\""
68+
env:
69+
num: "${{ github.event.number }}"
70+
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
6671
- name: add extra environment variables
6772
run: src/ci/scripts/setup-environment.sh
6873
env:
@@ -133,14 +138,14 @@ jobs:
133138
name: try
134139
env:
135140
CI_JOB_NAME: "${{ matrix.name }}"
136-
SCCACHE_BUCKET: rust-lang-gha-caches
137-
DEPLOY_BUCKET: rust-lang-gha
138-
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
139-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
141+
SCCACHE_BUCKET: rust-lang-ci-sccache2
142+
DEPLOY_BUCKET: rust-lang-ci2
143+
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
144+
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
140145
TOOLSTATE_PUBLISH: 1
141-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
142-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
143-
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
146+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
147+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
148+
CACHE_DOMAIN: ci-caches.rust-lang.org
144149
if: "github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
145150
strategy:
146151
matrix:
@@ -162,6 +167,11 @@ jobs:
162167
with:
163168
github_token: "${{ secrets.github_token }}"
164169
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
170+
- name: configure the PR in which the error message will be posted
171+
run: "echo \"[CI_PR_NUMBER=$num]\""
172+
env:
173+
num: "${{ github.event.number }}"
174+
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
165175
- name: add extra environment variables
166176
run: src/ci/scripts/setup-environment.sh
167177
env:
@@ -232,14 +242,14 @@ jobs:
232242
name: auto
233243
env:
234244
CI_JOB_NAME: "${{ matrix.name }}"
235-
SCCACHE_BUCKET: rust-lang-gha-caches
236-
DEPLOY_BUCKET: rust-lang-gha
237-
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
238-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
245+
SCCACHE_BUCKET: rust-lang-ci-sccache2
246+
DEPLOY_BUCKET: rust-lang-ci2
247+
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
248+
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
239249
TOOLSTATE_PUBLISH: 1
240-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
241-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
242-
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
250+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
251+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
252+
CACHE_DOMAIN: ci-caches.rust-lang.org
243253
if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
244254
strategy:
245255
matrix:
@@ -473,6 +483,11 @@ jobs:
473483
with:
474484
github_token: "${{ secrets.github_token }}"
475485
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
486+
- name: configure the PR in which the error message will be posted
487+
run: "echo \"[CI_PR_NUMBER=$num]\""
488+
env:
489+
num: "${{ github.event.number }}"
490+
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
476491
- name: add extra environment variables
477492
run: src/ci/scripts/setup-environment.sh
478493
env:
@@ -598,6 +613,11 @@ jobs:
598613
with:
599614
github_token: "${{ secrets.github_token }}"
600615
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
616+
- name: configure the PR in which the error message will be posted
617+
run: "echo \"[CI_PR_NUMBER=$num]\""
618+
env:
619+
num: "${{ github.event.number }}"
620+
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
601621
- name: add extra environment variables
602622
run: src/ci/scripts/setup-environment.sh
603623
env:
@@ -668,14 +688,14 @@ jobs:
668688
name: master
669689
runs-on: ubuntu-latest
670690
env:
671-
SCCACHE_BUCKET: rust-lang-gha-caches
672-
DEPLOY_BUCKET: rust-lang-gha
673-
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
674-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
691+
SCCACHE_BUCKET: rust-lang-ci-sccache2
692+
DEPLOY_BUCKET: rust-lang-ci2
693+
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
694+
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
675695
TOOLSTATE_PUBLISH: 1
676-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
677-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
678-
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
696+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
697+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
698+
CACHE_DOMAIN: ci-caches.rust-lang.org
679699
if: "github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'"
680700
steps:
681701
- name: checkout the source code

Diff for: src/bootstrap/install.rs

+5-24
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,6 @@ macro_rules! install {
159159
config.extended && config.tools.as_ref()
160160
.map_or(true, |t| t.contains($path))
161161
}
162-
163-
#[allow(dead_code)]
164-
fn should_install(builder: &Builder<'_>) -> bool {
165-
builder.config.tools.as_ref().map_or(false, |t| t.contains($path))
166-
}
167162
}
168163

169164
impl Step for $name {
@@ -210,8 +205,7 @@ install!((self, builder, _config),
210205
install_cargo(builder, self.compiler.stage, self.target);
211206
};
212207
Rls, "rls", Self::should_build(_config), only_hosts: true, {
213-
if builder.ensure(dist::Rls { compiler: self.compiler, target: self.target }).is_some() ||
214-
Self::should_install(builder) {
208+
if builder.ensure(dist::Rls { compiler: self.compiler, target: self.target }).is_some() {
215209
install_rls(builder, self.compiler.stage, self.target);
216210
} else {
217211
builder.info(
@@ -221,27 +215,14 @@ install!((self, builder, _config),
221215
};
222216
RustAnalyzer, "rust-analyzer", Self::should_build(_config), only_hosts: true, {
223217
builder.ensure(dist::RustAnalyzer { compiler: self.compiler, target: self.target });
224-
if Self::should_install(builder) {
225-
install_rust_analyzer(builder, self.compiler.stage, self.target);
226-
} else {
227-
builder.info(
228-
&format!("skipping Install rust-analyzer stage{} ({})", self.compiler.stage, self.target),
229-
);
230-
}
218+
install_rust_analyzer(builder, self.compiler.stage, self.target);
231219
};
232220
Clippy, "clippy", Self::should_build(_config), only_hosts: true, {
233221
builder.ensure(dist::Clippy { compiler: self.compiler, target: self.target });
234-
if Self::should_install(builder) {
235-
install_clippy(builder, self.compiler.stage, self.target);
236-
} else {
237-
builder.info(
238-
&format!("skipping Install clippy stage{} ({})", self.compiler.stage, self.target),
239-
);
240-
}
222+
install_clippy(builder, self.compiler.stage, self.target);
241223
};
242224
Miri, "miri", Self::should_build(_config), only_hosts: true, {
243-
if builder.ensure(dist::Miri { compiler: self.compiler, target: self.target }).is_some() ||
244-
Self::should_install(builder) {
225+
if builder.ensure(dist::Miri { compiler: self.compiler, target: self.target }).is_some() {
245226
install_miri(builder, self.compiler.stage, self.target);
246227
} else {
247228
builder.info(
@@ -253,7 +234,7 @@ install!((self, builder, _config),
253234
if builder.ensure(dist::Rustfmt {
254235
compiler: self.compiler,
255236
target: self.target
256-
}).is_some() || Self::should_install(builder) {
237+
}).is_some() {
257238
install_rustfmt(builder, self.compiler.stage, self.target);
258239
} else {
259240
builder.info(

Diff for: src/ci/azure-pipelines/auto.yml

+4-166
Original file line numberDiff line numberDiff line change
@@ -10,73 +10,23 @@
1010
#####################################
1111

1212
#
13-
# Azure Pipelines "auto" branch build for Rust on Linux, macOS, and Windows.
13+
# Azure Pipelines "auto" branch build for Rust on macOS
1414
#
1515

1616
pr: none
1717
trigger:
1818
- auto
1919

20-
variables:
21-
- group: prod-credentials
22-
2320
jobs:
24-
- job: Linux
25-
timeoutInMinutes: 600
26-
pool:
27-
vmImage: ubuntu-16.04
28-
steps:
29-
- template: steps/run.yml
30-
strategy:
31-
matrix:
32-
x86_64-gnu-llvm-8:
33-
RUST_BACKTRACE: 1
34-
dist-x86_64-linux: {}
35-
dist-x86_64-linux-alt:
36-
IMAGE: dist-x86_64-linux
37-
arm-android: {}
38-
armhf-gnu: {}
39-
dist-various-1: {}
40-
dist-various-2: {}
41-
dist-aarch64-linux: {}
42-
dist-android: {}
43-
dist-arm-linux: {}
44-
dist-armhf-linux: {}
45-
dist-armv7-linux: {}
46-
dist-i586-gnu-i586-i686-musl: {}
47-
dist-i686-freebsd: {}
48-
dist-i686-linux: {}
49-
dist-mips-linux: {}
50-
dist-mips64-linux: {}
51-
dist-mips64el-linux: {}
52-
dist-mipsel-linux: {}
53-
dist-powerpc-linux: {}
54-
dist-powerpc64-linux: {}
55-
dist-powerpc64le-linux: {}
56-
dist-s390x-linux: {}
57-
dist-x86_64-freebsd: {}
58-
dist-x86_64-musl: {}
59-
dist-x86_64-netbsd: {}
60-
i686-gnu: {}
61-
i686-gnu-nopt: {}
62-
test-various: {}
63-
wasm32: {}
64-
x86_64-gnu: {}
65-
x86_64-gnu-full-bootstrap: {}
66-
x86_64-gnu-aux: {}
67-
x86_64-gnu-tools:
68-
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
69-
x86_64-gnu-debug: {}
70-
x86_64-gnu-nopt: {}
71-
x86_64-gnu-distcheck: {}
72-
mingw-check: {}
73-
7421
- job: macOS
7522
timeoutInMinutes: 600
7623
pool:
7724
vmImage: macos-10.15
7825
steps:
7926
- template: steps/run.yml
27+
variables:
28+
# We're still uploading macOS builds from Azure Pipelines.
29+
- group: prod-credentials
8030
strategy:
8131
matrix:
8232
# OSX builders running tests, these run the full test suite.
@@ -110,115 +60,3 @@ jobs:
11060
MACOSX_DEPLOYMENT_TARGET: 10.7
11161
NO_LLVM_ASSERTIONS: 1
11262
NO_DEBUG_ASSERTIONS: 1
113-
114-
115-
- job: Windows
116-
timeoutInMinutes: 600
117-
pool:
118-
vmImage: 'vs2017-win2016'
119-
steps:
120-
- template: steps/run.yml
121-
strategy:
122-
matrix:
123-
# 32/64 bit MSVC tests
124-
x86_64-msvc-1:
125-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
126-
SCRIPT: make ci-subset-1
127-
# FIXME(#59637)
128-
NO_DEBUG_ASSERTIONS: 1
129-
NO_LLVM_ASSERTIONS: 1
130-
x86_64-msvc-2:
131-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
132-
SCRIPT: make ci-subset-2
133-
i686-msvc-1:
134-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
135-
SCRIPT: make ci-subset-1
136-
# FIXME(#59637)
137-
NO_DEBUG_ASSERTIONS: 1
138-
NO_LLVM_ASSERTIONS: 1
139-
i686-msvc-2:
140-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
141-
SCRIPT: make ci-subset-2
142-
# FIXME(#59637)
143-
NO_DEBUG_ASSERTIONS: 1
144-
NO_LLVM_ASSERTIONS: 1
145-
x86_64-msvc-cargo:
146-
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
147-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
148-
VCVARS_BAT: vcvars64.bat
149-
# FIXME(#59637)
150-
NO_DEBUG_ASSERTIONS: 1
151-
NO_LLVM_ASSERTIONS: 1
152-
# MSVC tools tests
153-
x86_64-msvc-tools:
154-
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py
155-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
156-
157-
# 32/64-bit MinGW builds.
158-
#
159-
# We are using MinGW with posix threads since LLVM does not compile with
160-
# the win32 threads version due to missing support for C++'s std::thread.
161-
#
162-
# Instead of relying on the MinGW version installed on appveryor we download
163-
# and install one ourselves so we won't be surprised by changes to appveyor's
164-
# build image.
165-
#
166-
# Finally, note that the downloads below are all in the `rust-lang-ci` S3
167-
# bucket, but they cleraly didn't originate there! The downloads originally
168-
# came from the mingw-w64 SourceForge download site. Unfortunately
169-
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
170-
i686-mingw-1:
171-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
172-
SCRIPT: make ci-mingw-subset-1
173-
CUSTOM_MINGW: 1
174-
# FIXME(#59637)
175-
NO_DEBUG_ASSERTIONS: 1
176-
NO_LLVM_ASSERTIONS: 1
177-
i686-mingw-2:
178-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
179-
SCRIPT: make ci-mingw-subset-2
180-
CUSTOM_MINGW: 1
181-
x86_64-mingw-1:
182-
SCRIPT: make ci-mingw-subset-1
183-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
184-
CUSTOM_MINGW: 1
185-
# FIXME(#59637)
186-
NO_DEBUG_ASSERTIONS: 1
187-
NO_LLVM_ASSERTIONS: 1
188-
x86_64-mingw-2:
189-
SCRIPT: make ci-mingw-subset-2
190-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
191-
CUSTOM_MINGW: 1
192-
193-
# 32/64 bit MSVC and GNU deployment
194-
dist-x86_64-msvc:
195-
INITIAL_RUST_CONFIGURE_ARGS: >-
196-
--build=x86_64-pc-windows-msvc
197-
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
198-
--enable-full-tools
199-
--enable-profiler
200-
SCRIPT: python x.py dist
201-
DIST_REQUIRE_ALL_TOOLS: 1
202-
dist-i686-msvc:
203-
INITIAL_RUST_CONFIGURE_ARGS: >-
204-
--build=i686-pc-windows-msvc
205-
--target=i586-pc-windows-msvc
206-
--enable-full-tools
207-
--enable-profiler
208-
SCRIPT: python x.py dist
209-
DIST_REQUIRE_ALL_TOOLS: 1
210-
dist-i686-mingw:
211-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
212-
SCRIPT: python x.py dist
213-
CUSTOM_MINGW: 1
214-
DIST_REQUIRE_ALL_TOOLS: 1
215-
dist-x86_64-mingw:
216-
SCRIPT: python x.py dist
217-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
218-
CUSTOM_MINGW: 1
219-
DIST_REQUIRE_ALL_TOOLS: 1
220-
221-
# "alternate" deployment, see .travis.yml for more info
222-
dist-x86_64-msvc-alt:
223-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
224-
SCRIPT: python x.py dist

0 commit comments

Comments
 (0)