Skip to content

Commit df35ff6

Browse files
committedApr 23, 2025·
Auto merge of #139983 - flip1995:clippy-subtree-update, r=Manishearth
Clippy subtree update r? `@Manishearth` Cargo.lock update due to the Clippy version bump and because Clippy moved from rinja (unmaintained) to askama. Last sync was skipped due to the askama issue and me not getting to fixing this in time.
·
1.90.01.88.0
2 parents 553600e + e8737e3 commit df35ff6

File tree

748 files changed

+13740
-7047
lines changed

Some content is hidden

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

748 files changed

+13740
-7047
lines changed
 

‎Cargo.lock‎

Lines changed: 22 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -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",
@@ -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"

‎src/bootstrap/src/utils/proc_macro_deps.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ pub static CRATES: &[&str] = &[
2828
"libc",
2929
"log",
3030
"memchr",
31-
"mime",
32-
"mime_guess",
3331
"minimal-lexical",
3432
"nom",
3533
"once_cell",
@@ -38,7 +36,6 @@ pub static CRATES: &[&str] = &[
3836
"pest_meta",
3937
"proc-macro2",
4038
"quote",
41-
"rinja_parser",
4239
"rustc-hash",
4340
"self_cell",
4441
"serde",
@@ -56,7 +53,6 @@ pub static CRATES: &[&str] = &[
5653
"unic-langid",
5754
"unic-langid-impl",
5855
"unic-langid-macros",
59-
"unicase",
6056
"unicode-ident",
6157
"unicode-width",
6258
"version_check",

0 commit comments

Comments
 (0)
Please sign in to comment.