Skip to content

Commit 8d3f940

Browse files
conradludgateconradludgate
committed
Merge branch 'master' into const_path
2 parents 5bb397d + 03c8b0b commit 8d3f940

File tree

8,362 files changed

+234010
-125174
lines changed

Some content is hidden

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

8,362 files changed

+234010
-125174
lines changed

‎.git-blame-ignore-revs

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# format the world
2+
a06baa56b95674fc626b3c3fd680d6a65357fe60
3+
# format libcore
4+
95e00bfed801e264e9c4ac817004153ca0f19eb6
5+
# reformat with new rustfmt
6+
971c549ca334b7b7406e61e958efcca9c4152822

‎.github/workflows/ci.yml

+91-61
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ jobs:
4141
matrix:
4242
include:
4343
- name: mingw-check
44-
os: ubuntu-latest-xl
44+
os: ubuntu-20.04-xl
4545
env: {}
4646
- name: x86_64-gnu-llvm-12
47-
os: ubuntu-latest-xl
47+
os: ubuntu-20.04-xl
4848
env: {}
4949
- name: x86_64-gnu-tools
5050
env:
5151
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
52-
os: ubuntu-latest-xl
52+
os: ubuntu-20.04-xl
5353
timeout-minutes: 600
5454
runs-on: "${{ matrix.os }}"
5555
steps:
5656
- name: disable git crlf conversion
5757
run: git config --global core.autocrlf false
5858
- name: checkout the source code
59-
uses: actions/checkout@v2
59+
uses: actions/checkout@v3
6060
with:
6161
fetch-depth: 2
6262
- name: configure the PR in which the error message will be posted
@@ -104,6 +104,9 @@ jobs:
104104
- name: disable git crlf conversion
105105
run: src/ci/scripts/disable-git-crlf-conversion.sh
106106
if: success() && !env.SKIP_JOB
107+
- name: checkout submodules
108+
run: src/ci/scripts/checkout-submodules.sh
109+
if: success() && !env.SKIP_JOB
107110
- name: install MSYS2
108111
run: src/ci/scripts/install-msys2.sh
109112
if: success() && !env.SKIP_JOB
@@ -119,15 +122,15 @@ jobs:
119122
- name: disable git crlf conversion
120123
run: src/ci/scripts/disable-git-crlf-conversion.sh
121124
if: success() && !env.SKIP_JOB
122-
- name: checkout submodules
123-
run: src/ci/scripts/checkout-submodules.sh
124-
if: success() && !env.SKIP_JOB
125125
- name: ensure line endings are correct
126126
run: src/ci/scripts/verify-line-endings.sh
127127
if: success() && !env.SKIP_JOB
128128
- name: ensure backported commits are in upstream branches
129129
run: src/ci/scripts/verify-backported-commits.sh
130130
if: success() && !env.SKIP_JOB
131+
- name: ensure the stable version number is correct
132+
run: src/ci/scripts/verify-stable-version-number.sh
133+
if: success() && !env.SKIP_JOB
131134
- name: run the build
132135
run: src/ci/scripts/run-build-from-ci.sh
133136
env:
@@ -163,139 +166,149 @@ jobs:
163166
- ARM64
164167
- linux
165168
- name: arm-android
166-
os: ubuntu-latest-xl
169+
os: ubuntu-20.04-xl
167170
env: {}
168171
- name: armhf-gnu
169-
os: ubuntu-latest-xl
172+
os: ubuntu-20.04-xl
170173
env: {}
171174
- name: dist-aarch64-linux
172-
os: ubuntu-latest-xl
175+
os: ubuntu-20.04-xl
173176
env: {}
174177
- name: dist-android
175-
os: ubuntu-latest-xl
178+
os: ubuntu-20.04-xl
176179
env: {}
177180
- name: dist-arm-linux
178-
os: ubuntu-latest-xl
181+
os: ubuntu-20.04-xl
179182
env: {}
180183
- name: dist-armhf-linux
181-
os: ubuntu-latest-xl
184+
os: ubuntu-20.04-xl
182185
env: {}
183186
- name: dist-armv7-linux
184-
os: ubuntu-latest-xl
187+
os: ubuntu-20.04-xl
185188
env: {}
186189
- name: dist-i586-gnu-i586-i686-musl
187-
os: ubuntu-latest-xl
190+
os: ubuntu-20.04-xl
188191
env: {}
189192
- name: dist-i686-linux
190-
os: ubuntu-latest-xl
193+
os: ubuntu-20.04-xl
191194
env: {}
192195
- name: dist-mips-linux
193-
os: ubuntu-latest-xl
196+
os: ubuntu-20.04-xl
194197
env: {}
195198
- name: dist-mips64-linux
196-
os: ubuntu-latest-xl
199+
os: ubuntu-20.04-xl
197200
env: {}
198201
- name: dist-mips64el-linux
199-
os: ubuntu-latest-xl
202+
os: ubuntu-20.04-xl
200203
env: {}
201204
- name: dist-mipsel-linux
202-
os: ubuntu-latest-xl
205+
os: ubuntu-20.04-xl
203206
env: {}
204207
- name: dist-powerpc-linux
205-
os: ubuntu-latest-xl
208+
os: ubuntu-20.04-xl
206209
env: {}
207210
- name: dist-powerpc64-linux
208-
os: ubuntu-latest-xl
211+
os: ubuntu-20.04-xl
209212
env: {}
210213
- name: dist-powerpc64le-linux
211-
os: ubuntu-latest-xl
214+
os: ubuntu-20.04-xl
212215
env: {}
213216
- name: dist-riscv64-linux
214-
os: ubuntu-latest-xl
217+
os: ubuntu-20.04-xl
215218
env: {}
216219
- name: dist-s390x-linux
217-
os: ubuntu-latest-xl
220+
os: ubuntu-20.04-xl
218221
env: {}
219222
- name: dist-various-1
220-
os: ubuntu-latest-xl
223+
os: ubuntu-20.04-xl
221224
env: {}
222225
- name: dist-various-2
223-
os: ubuntu-latest-xl
226+
os: ubuntu-20.04-xl
224227
env: {}
225228
- name: dist-x86_64-freebsd
226-
os: ubuntu-latest-xl
229+
os: ubuntu-20.04-xl
227230
env: {}
228231
- name: dist-x86_64-illumos
229-
os: ubuntu-latest-xl
232+
os: ubuntu-20.04-xl
230233
env: {}
231234
- name: dist-x86_64-linux
232-
os: ubuntu-latest-xl
235+
os: ubuntu-20.04-xl
233236
env: {}
234237
- name: dist-x86_64-linux-alt
235238
env:
236239
IMAGE: dist-x86_64-linux
237-
os: ubuntu-latest-xl
240+
os: ubuntu-20.04-xl
238241
- name: dist-x86_64-musl
239-
os: ubuntu-latest-xl
242+
os: ubuntu-20.04-xl
240243
env: {}
241244
- name: dist-x86_64-netbsd
242-
os: ubuntu-latest-xl
245+
os: ubuntu-20.04-xl
243246
env: {}
244247
- name: i686-gnu
245-
os: ubuntu-latest-xl
248+
os: ubuntu-20.04-xl
246249
env: {}
247250
- name: i686-gnu-nopt
248-
os: ubuntu-latest-xl
251+
os: ubuntu-20.04-xl
249252
env: {}
250253
- name: mingw-check
251-
os: ubuntu-latest-xl
254+
os: ubuntu-20.04-xl
252255
env: {}
253256
- name: test-various
254-
os: ubuntu-latest-xl
257+
os: ubuntu-20.04-xl
255258
env: {}
256259
- name: wasm32
257-
os: ubuntu-latest-xl
260+
os: ubuntu-20.04-xl
258261
env: {}
259262
- name: x86_64-gnu
260-
os: ubuntu-latest-xl
263+
os: ubuntu-20.04-xl
261264
env: {}
262265
- name: x86_64-gnu-stable
263266
env:
264267
IMAGE: x86_64-gnu
265268
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
266269
CI_ONLY_WHEN_CHANNEL: nightly
267-
os: ubuntu-latest-xl
270+
os: ubuntu-20.04-xl
268271
- name: x86_64-gnu-aux
269-
os: ubuntu-latest-xl
272+
os: ubuntu-20.04-xl
270273
env: {}
271274
- name: x86_64-gnu-debug
272-
os: ubuntu-latest-xl
275+
os: ubuntu-20.04-xl
273276
env: {}
274277
- name: x86_64-gnu-distcheck
275-
os: ubuntu-latest-xl
278+
os: ubuntu-20.04-xl
276279
env: {}
277280
- name: x86_64-gnu-llvm-12
278281
env:
279282
RUST_BACKTRACE: 1
280-
os: ubuntu-latest-xl
283+
os: ubuntu-20.04-xl
281284
- name: x86_64-gnu-nopt
282-
os: ubuntu-latest-xl
285+
os: ubuntu-20.04-xl
283286
env: {}
284287
- name: x86_64-gnu-tools
285288
env:
286289
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
287-
os: ubuntu-latest-xl
290+
os: ubuntu-20.04-xl
288291
- name: dist-x86_64-apple
289292
env:
290-
SCRIPT: "./x.py dist --exclude rust-docs --exclude extended && ./x.py dist --target=x86_64-apple-darwin rust-docs && ./x.py dist extended"
291-
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
293+
SCRIPT: "./x.py dist --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
294+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
292295
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
293296
MACOSX_DEPLOYMENT_TARGET: 10.7
294297
NO_LLVM_ASSERTIONS: 1
295298
NO_DEBUG_ASSERTIONS: 1
296299
NO_OVERFLOW_CHECKS: 1
297300
DIST_REQUIRE_ALL_TOOLS: 1
298301
os: macos-latest
302+
- name: dist-apple-various
303+
env:
304+
SCRIPT: "./x.py dist --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
305+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
306+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
307+
MACOSX_DEPLOYMENT_TARGET: 10.7
308+
NO_LLVM_ASSERTIONS: 1
309+
NO_DEBUG_ASSERTIONS: 1
310+
NO_OVERFLOW_CHECKS: 1
311+
os: macos-latest
299312
- name: dist-x86_64-apple-alt
300313
env:
301314
SCRIPT: "./x.py dist"
@@ -306,9 +319,20 @@ jobs:
306319
NO_DEBUG_ASSERTIONS: 1
307320
NO_OVERFLOW_CHECKS: 1
308321
os: macos-latest
309-
- name: x86_64-apple
322+
- name: x86_64-apple-1
310323
env:
311-
SCRIPT: "./x.py --stage 2 test"
324+
SCRIPT: "./x.py --stage 2 test --exclude src/test/ui --exclude src/test/rustdoc --exclude src/test/run-make-fulldeps"
325+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
326+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
327+
MACOSX_DEPLOYMENT_TARGET: 10.8
328+
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
329+
NO_LLVM_ASSERTIONS: 1
330+
NO_DEBUG_ASSERTIONS: 1
331+
NO_OVERFLOW_CHECKS: 1
332+
os: macos-latest
333+
- name: x86_64-apple-2
334+
env:
335+
SCRIPT: "./x.py --stage 2 test src/test/ui src/test/rustdoc src/test/run-make-fulldeps"
312336
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
313337
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
314338
MACOSX_DEPLOYMENT_TARGET: 10.8
@@ -320,7 +344,7 @@ jobs:
320344
- name: dist-aarch64-apple
321345
env:
322346
SCRIPT: "./x.py dist --stage 2"
323-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
347+
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"
324348
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
325349
USE_XCODE_CLANG: 1
326350
MACOSX_DEPLOYMENT_TARGET: 11.0
@@ -430,7 +454,7 @@ jobs:
430454
- name: disable git crlf conversion
431455
run: git config --global core.autocrlf false
432456
- name: checkout the source code
433-
uses: actions/checkout@v2
457+
uses: actions/checkout@v3
434458
with:
435459
fetch-depth: 2
436460
- name: configure the PR in which the error message will be posted
@@ -478,6 +502,9 @@ jobs:
478502
- name: disable git crlf conversion
479503
run: src/ci/scripts/disable-git-crlf-conversion.sh
480504
if: success() && !env.SKIP_JOB
505+
- name: checkout submodules
506+
run: src/ci/scripts/checkout-submodules.sh
507+
if: success() && !env.SKIP_JOB
481508
- name: install MSYS2
482509
run: src/ci/scripts/install-msys2.sh
483510
if: success() && !env.SKIP_JOB
@@ -493,15 +520,15 @@ jobs:
493520
- name: disable git crlf conversion
494521
run: src/ci/scripts/disable-git-crlf-conversion.sh
495522
if: success() && !env.SKIP_JOB
496-
- name: checkout submodules
497-
run: src/ci/scripts/checkout-submodules.sh
498-
if: success() && !env.SKIP_JOB
499523
- name: ensure line endings are correct
500524
run: src/ci/scripts/verify-line-endings.sh
501525
if: success() && !env.SKIP_JOB
502526
- name: ensure backported commits are in upstream branches
503527
run: src/ci/scripts/verify-backported-commits.sh
504528
if: success() && !env.SKIP_JOB
529+
- name: ensure the stable version number is correct
530+
run: src/ci/scripts/verify-stable-version-number.sh
531+
if: success() && !env.SKIP_JOB
505532
- name: run the build
506533
run: src/ci/scripts/run-build-from-ci.sh
507534
env:
@@ -532,15 +559,15 @@ jobs:
532559
matrix:
533560
include:
534561
- name: dist-x86_64-linux
535-
os: ubuntu-latest-xl
562+
os: ubuntu-20.04-xl
536563
env: {}
537564
timeout-minutes: 600
538565
runs-on: "${{ matrix.os }}"
539566
steps:
540567
- name: disable git crlf conversion
541568
run: git config --global core.autocrlf false
542569
- name: checkout the source code
543-
uses: actions/checkout@v2
570+
uses: actions/checkout@v3
544571
with:
545572
fetch-depth: 2
546573
- name: configure the PR in which the error message will be posted
@@ -588,6 +615,9 @@ jobs:
588615
- name: disable git crlf conversion
589616
run: src/ci/scripts/disable-git-crlf-conversion.sh
590617
if: success() && !env.SKIP_JOB
618+
- name: checkout submodules
619+
run: src/ci/scripts/checkout-submodules.sh
620+
if: success() && !env.SKIP_JOB
591621
- name: install MSYS2
592622
run: src/ci/scripts/install-msys2.sh
593623
if: success() && !env.SKIP_JOB
@@ -603,15 +633,15 @@ jobs:
603633
- name: disable git crlf conversion
604634
run: src/ci/scripts/disable-git-crlf-conversion.sh
605635
if: success() && !env.SKIP_JOB
606-
- name: checkout submodules
607-
run: src/ci/scripts/checkout-submodules.sh
608-
if: success() && !env.SKIP_JOB
609636
- name: ensure line endings are correct
610637
run: src/ci/scripts/verify-line-endings.sh
611638
if: success() && !env.SKIP_JOB
612639
- name: ensure backported commits are in upstream branches
613640
run: src/ci/scripts/verify-backported-commits.sh
614641
if: success() && !env.SKIP_JOB
642+
- name: ensure the stable version number is correct
643+
run: src/ci/scripts/verify-stable-version-number.sh
644+
if: success() && !env.SKIP_JOB
615645
- name: run the build
616646
run: src/ci/scripts/run-build-from-ci.sh
617647
env:
@@ -640,7 +670,7 @@ jobs:
640670
if: "github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'"
641671
steps:
642672
- name: checkout the source code
643-
uses: actions/checkout@v2
673+
uses: actions/checkout@v3
644674
with:
645675
fetch-depth: 2
646676
- name: publish toolstate

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ __pycache__/
7171
## Node
7272
node_modules
7373
package-lock.json
74+
package.json
7475

7576
## Rustdoc GUI tests
7677
src/test/rustdoc-gui/src/**.lock

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
[submodule "src/llvm-project"]
3535
path = src/llvm-project
3636
url = https://github.com/rust-lang/llvm-project.git
37-
branch = rustc/13.0-2021-09-30
37+
branch = rustc/14.0-2022-03-22
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book
4040
url = https://github.com/rust-embedded/book.git

0 commit comments

Comments
 (0)