Skip to content

Commit b18c828

Browse files
FractalFirFractalFir
authored
Merge branch 'master' into master
2 parents aebb289 + e28fae5 commit b18c828

File tree

2,758 files changed

+38267
-24039
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,758 files changed

+38267
-24039
lines changed

‎.github/workflows/ci.yml

+25-9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ name: CI
2828
- "**"
2929
permissions:
3030
contents: read
31+
packages: write
3132
defaults:
3233
run:
3334
shell: bash
@@ -42,6 +43,7 @@ jobs:
4243
CI_JOB_NAME: "${{ matrix.name }}"
4344
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
4445
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
46+
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
4547
SCCACHE_BUCKET: rust-lang-ci-sccache2
4648
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
4749
CACHE_DOMAIN: ci-caches.rust-lang.org
@@ -172,6 +174,7 @@ jobs:
172174
CI_JOB_NAME: "${{ matrix.name }}"
173175
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
174176
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
177+
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
175178
SCCACHE_BUCKET: rust-lang-ci-sccache2
176179
DEPLOY_BUCKET: rust-lang-ci2
177180
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
@@ -291,7 +294,7 @@ jobs:
291294
- name: x86_64-gnu-integration
292295
env:
293296
CI_ONLY_WHEN_CHANNEL: nightly
294-
os: ubuntu-20.04-16core-64gb
297+
os: ubuntu-20.04-8core-32gb
295298
- name: x86_64-gnu-debug
296299
os: ubuntu-20.04-8core-32gb
297300
env: {}
@@ -316,7 +319,7 @@ jobs:
316319
- name: dist-x86_64-apple
317320
env:
318321
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
319-
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
322+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
320323
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
321324
MACOSX_DEPLOYMENT_TARGET: 10.12
322325
SELECT_XCODE: /Applications/Xcode_13.4.1.app
@@ -329,7 +332,7 @@ jobs:
329332
- name: dist-apple-various
330333
env:
331334
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
332-
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
335+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
333336
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
334337
MACOSX_DEPLOYMENT_TARGET: 10.12
335338
SELECT_XCODE: /Applications/Xcode_13.4.1.app
@@ -340,7 +343,7 @@ jobs:
340343
- name: x86_64-apple-1
341344
env:
342345
SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
343-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
346+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
344347
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
345348
MACOSX_DEPLOYMENT_TARGET: 10.12
346349
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
@@ -351,7 +354,7 @@ jobs:
351354
- name: x86_64-apple-2
352355
env:
353356
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
354-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
357+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
355358
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
356359
MACOSX_DEPLOYMENT_TARGET: 10.12
357360
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
@@ -361,8 +364,8 @@ jobs:
361364
os: macos-13
362365
- name: dist-aarch64-apple
363366
env:
364-
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
365-
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"
367+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
368+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
366369
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
367370
SELECT_XCODE: /Applications/Xcode_13.4.1.app
368371
USE_XCODE_CLANG: 1
@@ -372,8 +375,20 @@ jobs:
372375
NO_DEBUG_ASSERTIONS: 1
373376
NO_OVERFLOW_CHECKS: 1
374377
DIST_REQUIRE_ALL_TOOLS: 1
375-
JEMALLOC_SYS_WITH_LG_PAGE: 14
376-
os: macos-13
378+
os: macos-14
379+
- name: aarch64-apple
380+
env:
381+
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
382+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
383+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
384+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
385+
USE_XCODE_CLANG: 1
386+
MACOSX_DEPLOYMENT_TARGET: 11.0
387+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
388+
NO_LLVM_ASSERTIONS: 1
389+
NO_DEBUG_ASSERTIONS: 1
390+
NO_OVERFLOW_CHECKS: 1
391+
os: macos-14
377392
- name: x86_64-msvc
378393
env:
379394
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -554,6 +569,7 @@ jobs:
554569
CI_JOB_NAME: "${{ matrix.name }}"
555570
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
556571
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
572+
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
557573
SCCACHE_BUCKET: rust-lang-ci-sccache2
558574
DEPLOY_BUCKET: rust-lang-ci2
559575
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"

‎Cargo.lock

+35-64
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ dependencies = [
3737

3838
[[package]]
3939
name = "ahash"
40-
version = "0.8.6"
40+
version = "0.8.7"
4141
source = "registry+https://github.com/rust-lang/crates.io-index"
42-
checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
42+
checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
4343
dependencies = [
4444
"cfg-if",
4545
"once_cell",
@@ -382,9 +382,9 @@ dependencies = [
382382

383383
[[package]]
384384
name = "byteorder"
385-
version = "1.4.3"
385+
version = "1.5.0"
386386
source = "registry+https://github.com/rust-lang/crates.io-index"
387-
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
387+
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
388388

389389
[[package]]
390390
name = "bytes"
@@ -596,11 +596,11 @@ dependencies = [
596596
name = "clippy_dev"
597597
version = "0.0.1"
598598
dependencies = [
599-
"aho-corasick 0.7.20",
599+
"aho-corasick 1.0.2",
600600
"clap",
601601
"indoc",
602602
"itertools",
603-
"opener 0.5.2",
603+
"opener",
604604
"shell-escape",
605605
"walkdir",
606606
]
@@ -610,7 +610,7 @@ name = "clippy_lints"
610610
version = "0.1.77"
611611
dependencies = [
612612
"arrayvec",
613-
"cargo_metadata 0.15.4",
613+
"cargo_metadata 0.18.0",
614614
"clippy_config",
615615
"clippy_utils",
616616
"declare_clippy_lint",
@@ -1268,7 +1268,6 @@ name = "error_index_generator"
12681268
version = "0.0.0"
12691269
dependencies = [
12701270
"mdbook",
1271-
"rustc_error_codes",
12721271
]
12731272

12741273
[[package]]
@@ -2170,9 +2169,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
21702169

21712170
[[package]]
21722171
name = "libc"
2173-
version = "0.2.150"
2172+
version = "0.2.153"
21742173
source = "registry+https://github.com/rust-lang/crates.io-index"
2175-
checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
2174+
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
21762175
dependencies = [
21772176
"rustc-std-workspace-core",
21782177
]
@@ -2351,7 +2350,7 @@ dependencies = [
23512350
"log",
23522351
"memchr",
23532352
"once_cell",
2354-
"opener 0.6.1",
2353+
"opener",
23552354
"pathdiff",
23562355
"pulldown-cmark",
23572356
"regex",
@@ -2596,9 +2595,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
25962595

25972596
[[package]]
25982597
name = "object"
2599-
version = "0.32.1"
2598+
version = "0.32.2"
26002599
source = "registry+https://github.com/rust-lang/crates.io-index"
2601-
checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
2600+
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
26022601
dependencies = [
26032602
"compiler_builtins",
26042603
"crc32fast",
@@ -2626,16 +2625,6 @@ version = "1.18.0"
26262625
source = "registry+https://github.com/rust-lang/crates.io-index"
26272626
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
26282627

2629-
[[package]]
2630-
name = "opener"
2631-
version = "0.5.2"
2632-
source = "registry+https://github.com/rust-lang/crates.io-index"
2633-
checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005"
2634-
dependencies = [
2635-
"bstr",
2636-
"winapi",
2637-
]
2638-
26392628
[[package]]
26402629
name = "opener"
26412630
version = "0.6.1"
@@ -3014,11 +3003,11 @@ dependencies = [
30143003

30153004
[[package]]
30163005
name = "pulldown-cmark"
3017-
version = "0.9.3"
3006+
version = "0.9.6"
30183007
source = "registry+https://github.com/rust-lang/crates.io-index"
3019-
checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
3008+
checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
30203009
dependencies = [
3021-
"bitflags 1.3.2",
3010+
"bitflags 2.4.1",
30223011
"memchr",
30233012
"unicase",
30243013
]
@@ -3711,7 +3700,6 @@ dependencies = [
37113700
"rustc_codegen_ssa",
37123701
"rustc_const_eval",
37133702
"rustc_data_structures",
3714-
"rustc_error_codes",
37153703
"rustc_errors",
37163704
"rustc_expand",
37173705
"rustc_feature",
@@ -3784,9 +3772,11 @@ dependencies = [
37843772
"rustc_ast",
37853773
"rustc_ast_pretty",
37863774
"rustc_data_structures",
3775+
"rustc_error_codes",
37873776
"rustc_error_messages",
37883777
"rustc_fluent_macro",
37893778
"rustc_hir",
3779+
"rustc_index",
37903780
"rustc_lint_defs",
37913781
"rustc_macros",
37923782
"rustc_serialize",
@@ -4352,7 +4342,6 @@ dependencies = [
43524342
name = "rustc_pattern_analysis"
43534343
version = "0.0.0"
43544344
dependencies = [
4355-
"derivative",
43564345
"rustc-hash",
43574346
"rustc_apfloat",
43584347
"rustc_arena",
@@ -4385,6 +4374,7 @@ dependencies = [
43854374
"rustc_middle",
43864375
"rustc_session",
43874376
"rustc_span",
4377+
"rustc_ty_utils",
43884378
"tracing",
43894379
]
43904380

@@ -4797,12 +4787,12 @@ checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
47974787

47984788
[[package]]
47994789
name = "ruzstd"
4800-
version = "0.4.0"
4790+
version = "0.5.0"
48014791
source = "registry+https://github.com/rust-lang/crates.io-index"
4802-
checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
4792+
checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
48034793
dependencies = [
48044794
"byteorder",
4805-
"thiserror-core",
4795+
"derive_more",
48064796
"twox-hash",
48074797
]
48084798

@@ -5332,6 +5322,7 @@ version = "0.0.0"
53325322
dependencies = [
53335323
"core",
53345324
"getopts",
5325+
"libc",
53355326
"panic_abort",
53365327
"panic_unwind",
53375328
"std",
@@ -5365,26 +5356,6 @@ dependencies = [
53655356
"thiserror-impl",
53665357
]
53675358

5368-
[[package]]
5369-
name = "thiserror-core"
5370-
version = "1.0.38"
5371-
source = "registry+https://github.com/rust-lang/crates.io-index"
5372-
checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
5373-
dependencies = [
5374-
"thiserror-core-impl",
5375-
]
5376-
5377-
[[package]]
5378-
name = "thiserror-core-impl"
5379-
version = "1.0.38"
5380-
source = "registry+https://github.com/rust-lang/crates.io-index"
5381-
checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
5382-
dependencies = [
5383-
"proc-macro2",
5384-
"quote",
5385-
"syn 1.0.109",
5386-
]
5387-
53885359
[[package]]
53895360
name = "thiserror-impl"
53905361
version = "1.0.47"
@@ -5757,28 +5728,28 @@ dependencies = [
57575728

57585729
[[package]]
57595730
name = "unic-langid"
5760-
version = "0.9.1"
5731+
version = "0.9.4"
57615732
source = "registry+https://github.com/rust-lang/crates.io-index"
5762-
checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f"
5733+
checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516"
57635734
dependencies = [
57645735
"unic-langid-impl",
57655736
"unic-langid-macros",
57665737
]
57675738

57685739
[[package]]
57695740
name = "unic-langid-impl"
5770-
version = "0.9.1"
5741+
version = "0.9.4"
57715742
source = "registry+https://github.com/rust-lang/crates.io-index"
5772-
checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff"
5743+
checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6"
57735744
dependencies = [
57745745
"tinystr",
57755746
]
57765747

57775748
[[package]]
57785749
name = "unic-langid-macros"
5779-
version = "0.9.1"
5750+
version = "0.9.4"
57805751
source = "registry+https://github.com/rust-lang/crates.io-index"
5781-
checksum = "055e618bf694161ffff0466d95cef3e1a5edc59f6ba1888e97801f2b4ebdc4fe"
5752+
checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec"
57825753
dependencies = [
57835754
"proc-macro-hack",
57845755
"tinystr",
@@ -5788,13 +5759,13 @@ dependencies = [
57885759

57895760
[[package]]
57905761
name = "unic-langid-macros-impl"
5791-
version = "0.9.1"
5762+
version = "0.9.4"
57925763
source = "registry+https://github.com/rust-lang/crates.io-index"
5793-
checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8"
5764+
checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4"
57945765
dependencies = [
57955766
"proc-macro-hack",
57965767
"quote",
5797-
"syn 1.0.109",
5768+
"syn 2.0.32",
57985769
"unic-langid-impl",
57995770
]
58005771

@@ -6437,18 +6408,18 @@ dependencies = [
64376408

64386409
[[package]]
64396410
name = "zerocopy"
6440-
version = "0.7.28"
6411+
version = "0.7.32"
64416412
source = "registry+https://github.com/rust-lang/crates.io-index"
6442-
checksum = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e"
6413+
checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
64436414
dependencies = [
64446415
"zerocopy-derive",
64456416
]
64466417

64476418
[[package]]
64486419
name = "zerocopy-derive"
6449-
version = "0.7.28"
6420+
version = "0.7.32"
64506421
source = "registry+https://github.com/rust-lang/crates.io-index"
6451-
checksum = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b"
6422+
checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
64526423
dependencies = [
64536424
"proc-macro2",
64546425
"quote",

0 commit comments

Comments
 (0)