Skip to content

Commit 562d529

Browse files
borsbors
committed
Auto merge of #3286 - rust-lang:rustup-2024-01-31, r=saethlin
Automatic Rustup
2 parents 71f8f49 + 24fece2 commit 562d529

File tree

915 files changed

+11069
-6921
lines changed

Some content is hidden

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

915 files changed

+11069
-6921
lines changed

‎.github/workflows/ci.yml

+4
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"
@@ -554,6 +557,7 @@ jobs:
554557
CI_JOB_NAME: "${{ matrix.name }}"
555558
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
556559
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
560+
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
557561
SCCACHE_BUCKET: rust-lang-ci-sccache2
558562
DEPLOY_BUCKET: rust-lang-ci2
559563
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"

‎Cargo.lock

+25-56
Original file line numberDiff line numberDiff line change
@@ -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]]
@@ -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",
@@ -4797,12 +4786,12 @@ checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
47974786

47984787
[[package]]
47994788
name = "ruzstd"
4800-
version = "0.4.0"
4789+
version = "0.5.0"
48014790
source = "registry+https://github.com/rust-lang/crates.io-index"
4802-
checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
4791+
checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
48034792
dependencies = [
48044793
"byteorder",
4805-
"thiserror-core",
4794+
"derive_more",
48064795
"twox-hash",
48074796
]
48084797

@@ -5365,26 +5354,6 @@ dependencies = [
53655354
"thiserror-impl",
53665355
]
53675356

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-
53885357
[[package]]
53895358
name = "thiserror-impl"
53905359
version = "1.0.47"
@@ -5757,28 +5726,28 @@ dependencies = [
57575726

57585727
[[package]]
57595728
name = "unic-langid"
5760-
version = "0.9.1"
5729+
version = "0.9.4"
57615730
source = "registry+https://github.com/rust-lang/crates.io-index"
5762-
checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f"
5731+
checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516"
57635732
dependencies = [
57645733
"unic-langid-impl",
57655734
"unic-langid-macros",
57665735
]
57675736

57685737
[[package]]
57695738
name = "unic-langid-impl"
5770-
version = "0.9.1"
5739+
version = "0.9.4"
57715740
source = "registry+https://github.com/rust-lang/crates.io-index"
5772-
checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff"
5741+
checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6"
57735742
dependencies = [
57745743
"tinystr",
57755744
]
57765745

57775746
[[package]]
57785747
name = "unic-langid-macros"
5779-
version = "0.9.1"
5748+
version = "0.9.4"
57805749
source = "registry+https://github.com/rust-lang/crates.io-index"
5781-
checksum = "055e618bf694161ffff0466d95cef3e1a5edc59f6ba1888e97801f2b4ebdc4fe"
5750+
checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec"
57825751
dependencies = [
57835752
"proc-macro-hack",
57845753
"tinystr",
@@ -5788,13 +5757,13 @@ dependencies = [
57885757

57895758
[[package]]
57905759
name = "unic-langid-macros-impl"
5791-
version = "0.9.1"
5760+
version = "0.9.4"
57925761
source = "registry+https://github.com/rust-lang/crates.io-index"
5793-
checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8"
5762+
checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4"
57945763
dependencies = [
57955764
"proc-macro-hack",
57965765
"quote",
5797-
"syn 1.0.109",
5766+
"syn 2.0.32",
57985767
"unic-langid-impl",
57995768
]
58005769

‎compiler/rustc_ast/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@
1313
#![feature(rustdoc_internals)]
1414
#![feature(associated_type_bounds)]
1515
#![feature(box_patterns)]
16-
#![feature(const_trait_impl)]
1716
#![feature(if_let_guard)]
1817
#![feature(let_chains)]
1918
#![feature(min_specialization)]
2019
#![feature(negative_impls)]
2120
#![feature(stmt_expr_attributes)]
22-
#![recursion_limit = "256"]
2321
#![deny(rustc::untranslatable_diagnostic)]
2422
#![deny(rustc::diagnostic_outside_of_impl)]
2523

0 commit comments

Comments
 (0)