Skip to content

Commit d91ffb6

Browse files
JohnTitorJohnTitor
authored
Merge pull request rust-lang#2351 from rust-lang/rustc-pull
2 parents 89bb181 + 1b315ad commit d91ffb6

File tree

1,178 files changed

+20285
-10986
lines changed

Some content is hidden

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

1,178 files changed

+20285
-10986
lines changed

‎.github/workflows/ci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ jobs:
125125
# which then uses log commands to actually set them.
126126
EXTRA_VARIABLES: ${{ toJson(matrix.env) }}
127127

128-
- name: setup upstream remote
129-
run: src/ci/scripts/setup-upstream-remote.sh
130-
131128
- name: ensure the channel matches the target branch
132129
run: src/ci/scripts/verify-channel.sh
133130

‎Cargo.lock

+45-85
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ dependencies = [
225225
"memchr",
226226
"serde",
227227
"serde_derive",
228-
"winnow 0.7.4",
228+
"winnow 0.7.6",
229229
]
230230

231231
[[package]]
@@ -303,9 +303,9 @@ dependencies = [
303303

304304
[[package]]
305305
name = "bstr"
306-
version = "1.11.3"
306+
version = "1.12.0"
307307
source = "registry+https://github.com/rust-lang/crates.io-index"
308-
checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
308+
checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
309309
dependencies = [
310310
"memchr",
311311
"regex-automata 0.4.9",
@@ -496,9 +496,9 @@ dependencies = [
496496

497497
[[package]]
498498
name = "clap"
499-
version = "4.5.35"
499+
version = "4.5.36"
500500
source = "registry+https://github.com/rust-lang/crates.io-index"
501-
checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
501+
checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04"
502502
dependencies = [
503503
"clap_builder",
504504
"clap_derive",
@@ -516,9 +516,9 @@ dependencies = [
516516

517517
[[package]]
518518
name = "clap_builder"
519-
version = "4.5.35"
519+
version = "4.5.36"
520520
source = "registry+https://github.com/rust-lang/crates.io-index"
521-
checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
521+
checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5"
522522
dependencies = [
523523
"anstream",
524524
"anstyle",
@@ -546,12 +546,14 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
546546

547547
[[package]]
548548
name = "clippy"
549-
version = "0.1.87"
549+
version = "0.1.88"
550550
dependencies = [
551551
"anstream",
552+
"askama",
552553
"cargo_metadata 0.18.1",
553554
"clippy_config",
554555
"clippy_lints",
556+
"clippy_lints_internal",
555557
"clippy_utils",
556558
"color-print",
557559
"filetime",
@@ -562,7 +564,6 @@ dependencies = [
562564
"pulldown-cmark 0.11.3",
563565
"quote",
564566
"regex",
565-
"rinja",
566567
"rustc_tools_util 0.4.2",
567568
"serde",
568569
"serde_json",
@@ -577,7 +578,7 @@ dependencies = [
577578

578579
[[package]]
579580
name = "clippy_config"
580-
version = "0.1.87"
581+
version = "0.1.88"
581582
dependencies = [
582583
"clippy_utils",
583584
"itertools",
@@ -602,30 +603,37 @@ dependencies = [
602603

603604
[[package]]
604605
name = "clippy_lints"
605-
version = "0.1.87"
606+
version = "0.1.88"
606607
dependencies = [
607608
"arrayvec",
608609
"cargo_metadata 0.18.1",
609610
"clippy_config",
610611
"clippy_utils",
611612
"itertools",
612613
"quine-mc_cluskey",
613-
"regex",
614614
"regex-syntax 0.8.5",
615615
"semver",
616616
"serde",
617-
"serde_json",
618-
"tempfile",
619617
"toml 0.7.8",
620618
"unicode-normalization",
621619
"unicode-script",
622620
"url",
623621
"walkdir",
624622
]
625623

624+
[[package]]
625+
name = "clippy_lints_internal"
626+
version = "0.0.1"
627+
dependencies = [
628+
"clippy_config",
629+
"clippy_utils",
630+
"regex",
631+
"rustc-semver",
632+
]
633+
626634
[[package]]
627635
name = "clippy_utils"
628-
version = "0.1.87"
636+
version = "0.1.88"
629637
dependencies = [
630638
"arrayvec",
631639
"itertools",
@@ -798,9 +806,9 @@ dependencies = [
798806

799807
[[package]]
800808
name = "crossbeam-channel"
801-
version = "0.5.14"
809+
version = "0.5.15"
802810
source = "registry+https://github.com/rust-lang/crates.io-index"
803-
checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
811+
checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
804812
dependencies = [
805813
"crossbeam-utils",
806814
]
@@ -1910,9 +1918,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
19101918

19111919
[[package]]
19121920
name = "jiff"
1913-
version = "0.2.5"
1921+
version = "0.2.6"
19141922
source = "registry+https://github.com/rust-lang/crates.io-index"
1915-
checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260"
1923+
checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488"
19161924
dependencies = [
19171925
"jiff-static",
19181926
"log",
@@ -1923,9 +1931,9 @@ dependencies = [
19231931

19241932
[[package]]
19251933
name = "jiff-static"
1926-
version = "0.2.5"
1934+
version = "0.2.6"
19271935
source = "registry+https://github.com/rust-lang/crates.io-index"
1928-
checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c"
1936+
checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19"
19291937
dependencies = [
19301938
"proc-macro2",
19311939
"quote",
@@ -1979,9 +1987,9 @@ dependencies = [
19791987

19801988
[[package]]
19811989
name = "jsonpath-rust"
1982-
version = "1.0.0"
1990+
version = "1.0.1"
19831991
source = "registry+https://github.com/rust-lang/crates.io-index"
1984-
checksum = "9b0231bb404a6cd6c8f0ab41b907049063a089fc02aa7636cc5cd9a4d87364c9"
1992+
checksum = "6a37c2c87b8d16e788ce359660fead0ea5f4ed29ff400d55be74a4e01d1817d9"
19851993
dependencies = [
19861994
"pest",
19871995
"pest_derive",
@@ -2113,9 +2121,9 @@ dependencies = [
21132121

21142122
[[package]]
21152123
name = "linux-raw-sys"
2116-
version = "0.9.3"
2124+
version = "0.9.4"
21172125
source = "registry+https://github.com/rust-lang/crates.io-index"
2118-
checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
2126+
checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
21192127

21202128
[[package]]
21212129
name = "litemap"
@@ -2244,22 +2252,6 @@ dependencies = [
22442252
"libc",
22452253
]
22462254

2247-
[[package]]
2248-
name = "mime"
2249-
version = "0.3.17"
2250-
source = "registry+https://github.com/rust-lang/crates.io-index"
2251-
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
2252-
2253-
[[package]]
2254-
name = "mime_guess"
2255-
version = "2.0.5"
2256-
source = "registry+https://github.com/rust-lang/crates.io-index"
2257-
checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
2258-
dependencies = [
2259-
"mime",
2260-
"unicase",
2261-
]
2262-
22632255
[[package]]
22642256
name = "minifier"
22652257
version = "0.3.5"
@@ -3084,45 +3076,6 @@ dependencies = [
30843076
"walkdir",
30853077
]
30863078

3087-
[[package]]
3088-
name = "rinja"
3089-
version = "0.3.5"
3090-
source = "registry+https://github.com/rust-lang/crates.io-index"
3091-
checksum = "3dc4940d00595430b3d7d5a01f6222b5e5b51395d1120bdb28d854bb8abb17a5"
3092-
dependencies = [
3093-
"itoa",
3094-
"rinja_derive",
3095-
]
3096-
3097-
[[package]]
3098-
name = "rinja_derive"
3099-
version = "0.3.5"
3100-
source = "registry+https://github.com/rust-lang/crates.io-index"
3101-
checksum = "08d9ed0146aef6e2825f1b1515f074510549efba38d71f4554eec32eb36ba18b"
3102-
dependencies = [
3103-
"basic-toml",
3104-
"memchr",
3105-
"mime",
3106-
"mime_guess",
3107-
"proc-macro2",
3108-
"quote",
3109-
"rinja_parser",
3110-
"rustc-hash 2.1.1",
3111-
"serde",
3112-
"syn 2.0.100",
3113-
]
3114-
3115-
[[package]]
3116-
name = "rinja_parser"
3117-
version = "0.3.5"
3118-
source = "registry+https://github.com/rust-lang/crates.io-index"
3119-
checksum = "93f9a866e2e00a7a1fb27e46e9e324a6f7c0e7edc4543cae1d38f4e4a100c610"
3120-
dependencies = [
3121-
"memchr",
3122-
"nom",
3123-
"serde",
3124-
]
3125-
31263079
[[package]]
31273080
name = "run_make_support"
31283081
version = "0.2.0"
@@ -3196,6 +3149,12 @@ dependencies = [
31963149
"crossbeam-utils",
31973150
]
31983151

3152+
[[package]]
3153+
name = "rustc-semver"
3154+
version = "1.1.0"
3155+
source = "registry+https://github.com/rust-lang/crates.io-index"
3156+
checksum = "5be1bdc7edf596692617627bbfeaba522131b18e06ca4df2b6b689e3c5d5ce84"
3157+
31993158
[[package]]
32003159
name = "rustc-stable-hash"
32013160
version = "0.1.2"
@@ -4562,6 +4521,7 @@ dependencies = [
45624521
"rustc_hir",
45634522
"rustc_middle",
45644523
"rustc_span",
4524+
"smallvec",
45654525
"tracing",
45664526
]
45674527

@@ -4807,14 +4767,14 @@ version = "0.10.3"
48074767
source = "registry+https://github.com/rust-lang/crates.io-index"
48084768
checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d"
48094769
dependencies = [
4810-
"self_cell 1.1.0",
4770+
"self_cell 1.2.0",
48114771
]
48124772

48134773
[[package]]
48144774
name = "self_cell"
4815-
version = "1.1.0"
4775+
version = "1.2.0"
48164776
source = "registry+https://github.com/rust-lang/crates.io-index"
4817-
checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
4777+
checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
48184778

48194779
[[package]]
48204780
name = "semver"
@@ -6415,9 +6375,9 @@ dependencies = [
64156375

64166376
[[package]]
64176377
name = "winnow"
6418-
version = "0.7.4"
6378+
version = "0.7.6"
64196379
source = "registry+https://github.com/rust-lang/crates.io-index"
6420-
checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
6380+
checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
64216381
dependencies = [
64226382
"memchr",
64236383
]

‎compiler/rustc_ast/src/attr/mod.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,7 @@ impl MetaItem {
416416
// This path is currently unreachable in the test suite.
417417
unreachable!()
418418
}
419-
Some(TokenTree::Token(
420-
Token { kind: token::OpenDelim(_) | token::CloseDelim(_), .. },
421-
_,
422-
)) => {
419+
Some(TokenTree::Token(Token { kind, .. }, _)) if kind.is_delim() => {
423420
panic!("Should be `AttrTokenTree::Delimited`, not delim tokens: {:?}", tt);
424421
}
425422
_ => return None,

0 commit comments

Comments
 (0)