Skip to content

Commit 697d130

Browse files
RalfJungRalfJung
committed
Merge from rustc
2 parents e52cc12 + eb62877 commit 697d130

File tree

2,531 files changed

+30017
-18872
lines changed

Some content is hidden

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

2,531 files changed

+30017
-18872
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ trim_trailing_whitespace = false
2020

2121
[*.yml]
2222
indent_size = 2
23+
24+
[Makefile]
25+
indent_style = tab

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ a06baa56b95674fc626b3c3fd680d6a65357fe60
1212
c34fbfaad38cf5829ef5cfe780dc9d58480adeaa
1313
# move tests
1414
cf2dff2b1e3fa55fa5415d524200070d0d7aacfe
15+
# Run rustfmt on bootstrap
16+
b39a1d6f1a30ba29f25d7141038b9a5bf0126e36

‎.github/ISSUE_TEMPLATE/library_tracking_issue.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Tracking issues are for tracking a feature from implementation to stabilization.
1212
Make sure to include the relevant RFC for the feature if it has one.
1313
1414
If the new feature is small, it may be fine to skip the RFC process. In that
15-
case, you can use use `issue = "none"` in your initial implementation PR. The
15+
case, you can use `issue = "none"` in your initial implementation PR. The
1616
reviewer will ask you to open a tracking issue if they agree your feature can be
1717
added without an RFC.
1818
-->
@@ -65,7 +65,7 @@ the rfcbot will ask all the team members to verify they agree with
6565
stabilization. Once enough members agree and there are no concerns, the final
6666
comment period begins: this issue will be marked as such and will be listed
6767
in the next This Week in Rust newsletter. If no blocking concerns are raised in
68-
that period of 10 days, a stabilzation PR can be opened by anyone.
68+
that period of 10 days, a stabilization PR can be opened by anyone.
6969
-->
7070

7171
### Unresolved Questions

‎.github/workflows/ci.yml‎

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -181,70 +181,70 @@ jobs:
181181
- ARM64
182182
- linux
183183
- name: arm-android
184-
os: ubuntu-20.04-16core-64gb
184+
os: ubuntu-20.04-8core-32gb
185185
env: {}
186186
- name: armhf-gnu
187-
os: ubuntu-20.04-16core-64gb
187+
os: ubuntu-20.04-8core-32gb
188188
env: {}
189189
- name: dist-aarch64-linux
190-
os: ubuntu-20.04-16core-64gb
190+
os: ubuntu-20.04-8core-32gb
191191
env: {}
192192
- name: dist-android
193-
os: ubuntu-20.04-16core-64gb
193+
os: ubuntu-20.04-8core-32gb
194194
env: {}
195195
- name: dist-arm-linux
196196
os: ubuntu-20.04-16core-64gb
197197
env: {}
198198
- name: dist-armhf-linux
199-
os: ubuntu-20.04-16core-64gb
199+
os: ubuntu-20.04-8core-32gb
200200
env: {}
201201
- name: dist-armv7-linux
202-
os: ubuntu-20.04-16core-64gb
202+
os: ubuntu-20.04-8core-32gb
203203
env: {}
204204
- name: dist-i586-gnu-i586-i686-musl
205-
os: ubuntu-20.04-16core-64gb
205+
os: ubuntu-20.04-8core-32gb
206206
env: {}
207207
- name: dist-i686-linux
208-
os: ubuntu-20.04-16core-64gb
208+
os: ubuntu-20.04-8core-32gb
209209
env: {}
210210
- name: dist-mips-linux
211-
os: ubuntu-20.04-16core-64gb
211+
os: ubuntu-20.04-8core-32gb
212212
env: {}
213213
- name: dist-mips64-linux
214-
os: ubuntu-20.04-16core-64gb
214+
os: ubuntu-20.04-8core-32gb
215215
env: {}
216216
- name: dist-mips64el-linux
217-
os: ubuntu-20.04-16core-64gb
217+
os: ubuntu-20.04-8core-32gb
218218
env: {}
219219
- name: dist-mipsel-linux
220-
os: ubuntu-20.04-16core-64gb
220+
os: ubuntu-20.04-8core-32gb
221221
env: {}
222222
- name: dist-powerpc-linux
223-
os: ubuntu-20.04-16core-64gb
223+
os: ubuntu-20.04-8core-32gb
224224
env: {}
225225
- name: dist-powerpc64-linux
226-
os: ubuntu-20.04-16core-64gb
226+
os: ubuntu-20.04-8core-32gb
227227
env: {}
228228
- name: dist-powerpc64le-linux
229-
os: ubuntu-20.04-16core-64gb
229+
os: ubuntu-20.04-8core-32gb
230230
env: {}
231231
- name: dist-riscv64-linux
232-
os: ubuntu-20.04-16core-64gb
232+
os: ubuntu-20.04-8core-32gb
233233
env: {}
234234
- name: dist-s390x-linux
235-
os: ubuntu-20.04-16core-64gb
235+
os: ubuntu-20.04-8core-32gb
236236
env: {}
237237
- name: dist-various-1
238-
os: ubuntu-20.04-16core-64gb
238+
os: ubuntu-20.04-8core-32gb
239239
env: {}
240240
- name: dist-various-2
241-
os: ubuntu-20.04-16core-64gb
241+
os: ubuntu-20.04-8core-32gb
242242
env: {}
243243
- name: dist-x86_64-freebsd
244-
os: ubuntu-20.04-16core-64gb
244+
os: ubuntu-20.04-8core-32gb
245245
env: {}
246246
- name: dist-x86_64-illumos
247-
os: ubuntu-20.04-16core-64gb
247+
os: ubuntu-20.04-8core-32gb
248248
env: {}
249249
- name: dist-x86_64-linux
250250
os: ubuntu-20.04-16core-64gb
@@ -254,10 +254,10 @@ jobs:
254254
IMAGE: dist-x86_64-linux
255255
os: ubuntu-20.04-16core-64gb
256256
- name: dist-x86_64-musl
257-
os: ubuntu-20.04-16core-64gb
257+
os: ubuntu-20.04-8core-32gb
258258
env: {}
259259
- name: dist-x86_64-netbsd
260-
os: ubuntu-20.04-16core-64gb
260+
os: ubuntu-20.04-8core-32gb
261261
env: {}
262262
- name: i686-gnu
263263
os: ubuntu-20.04-16core-64gb
@@ -266,51 +266,55 @@ jobs:
266266
os: ubuntu-20.04-16core-64gb
267267
env: {}
268268
- name: mingw-check
269-
os: ubuntu-20.04-16core-64gb
269+
os: ubuntu-20.04-8core-32gb
270270
env: {}
271271
- name: test-various
272-
os: ubuntu-20.04-16core-64gb
272+
os: ubuntu-20.04-8core-32gb
273273
env: {}
274274
- name: wasm32
275-
os: ubuntu-20.04-16core-64gb
275+
os: ubuntu-20.04-8core-32gb
276276
env: {}
277277
- name: x86_64-gnu
278-
os: ubuntu-20.04-16core-64gb
278+
os: ubuntu-20.04-8core-32gb
279279
env: {}
280280
- name: x86_64-gnu-stable
281281
env:
282282
IMAGE: x86_64-gnu
283283
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
284284
CI_ONLY_WHEN_CHANNEL: nightly
285-
os: ubuntu-20.04-16core-64gb
285+
os: ubuntu-20.04-8core-32gb
286286
- name: x86_64-gnu-aux
287-
os: ubuntu-20.04-16core-64gb
287+
os: ubuntu-20.04-8core-32gb
288288
env: {}
289289
- name: x86_64-gnu-debug
290-
os: ubuntu-20.04-16core-64gb
290+
os: ubuntu-20.04-8core-32gb
291291
env: {}
292292
- name: x86_64-gnu-distcheck
293-
os: ubuntu-20.04-16core-64gb
293+
os: ubuntu-20.04-8core-32gb
294294
env: {}
295+
- name: x86_64-gnu-llvm-16
296+
env:
297+
RUST_BACKTRACE: 1
298+
os: ubuntu-20.04-8core-32gb
295299
- name: x86_64-gnu-llvm-15
296300
env:
297301
RUST_BACKTRACE: 1
298-
os: ubuntu-20.04-16core-64gb
302+
os: ubuntu-20.04-8core-32gb
299303
- name: x86_64-gnu-llvm-14
300304
env:
301305
RUST_BACKTRACE: 1
302-
os: ubuntu-20.04-16core-64gb
306+
os: ubuntu-20.04-8core-32gb
303307
- name: x86_64-gnu-llvm-14-stage1
304308
env:
305309
RUST_BACKTRACE: 1
306-
os: ubuntu-20.04-16core-64gb
310+
os: ubuntu-20.04-8core-32gb
307311
- name: x86_64-gnu-nopt
308-
os: ubuntu-20.04-16core-64gb
312+
os: ubuntu-20.04-8core-32gb
309313
env: {}
310314
- name: x86_64-gnu-tools
311315
env:
312316
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
313-
os: ubuntu-20.04-16core-64gb
317+
os: ubuntu-20.04-8core-32gb
314318
- name: dist-x86_64-apple
315319
env:
316320
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -322,7 +326,7 @@ jobs:
322326
NO_DEBUG_ASSERTIONS: 1
323327
NO_OVERFLOW_CHECKS: 1
324328
DIST_REQUIRE_ALL_TOOLS: 1
325-
os: macos-12-xl
329+
os: macos-latest
326330
- name: dist-apple-various
327331
env:
328332
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -333,7 +337,7 @@ jobs:
333337
NO_LLVM_ASSERTIONS: 1
334338
NO_DEBUG_ASSERTIONS: 1
335339
NO_OVERFLOW_CHECKS: 1
336-
os: macos-12-xl
340+
os: macos-latest
337341
- name: dist-x86_64-apple-alt
338342
env:
339343
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -344,7 +348,7 @@ jobs:
344348
NO_LLVM_ASSERTIONS: 1
345349
NO_DEBUG_ASSERTIONS: 1
346350
NO_OVERFLOW_CHECKS: 1
347-
os: macos-12-xl
351+
os: macos-latest
348352
- name: x86_64-apple-1
349353
env:
350354
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -355,7 +359,7 @@ jobs:
355359
NO_LLVM_ASSERTIONS: 1
356360
NO_DEBUG_ASSERTIONS: 1
357361
NO_OVERFLOW_CHECKS: 1
358-
os: macos-12-xl
362+
os: macos-latest
359363
- name: x86_64-apple-2
360364
env:
361365
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -366,7 +370,7 @@ jobs:
366370
NO_LLVM_ASSERTIONS: 1
367371
NO_DEBUG_ASSERTIONS: 1
368372
NO_OVERFLOW_CHECKS: 1
369-
os: macos-12-xl
373+
os: macos-latest
370374
- name: dist-aarch64-apple
371375
env:
372376
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -381,7 +385,7 @@ jobs:
381385
NO_OVERFLOW_CHECKS: 1
382386
DIST_REQUIRE_ALL_TOOLS: 1
383387
JEMALLOC_SYS_WITH_LG_PAGE: 14
384-
os: macos-12-xl
388+
os: macos-latest
385389
- name: x86_64-msvc-1
386390
env:
387391
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"

0 commit comments

Comments
 (0)