Skip to content

Commit ea3068e

Browse files
committed
Auto merge of #85192 - klensy:bump-deps, r=Mark-Simulacrum
updated deps filetime v0.2.12 -> v0.2.14 alexcrichton/filetime@0.2.12...0.2.14 socket2 v0.3.16 -> v0.3.19 https://github.com/rust-lang/socket2/commits/v0.3.x tar v0.4.29 -> v0.4.33 alexcrichton/tar-rs@0.4.29...0.4.33 this drops dependency on redox_syscall 0.1.* --- measureme v9.1.0 -> v9.1.1 rust-lang/measureme@9.1.0...9.1.1 this drops dependency on memmap v0.7.0 --- version_check v0.9.1 -> v0.9.3 SergioBenitez/version_check@v0.9.1...v0.9.3 fixes version parse
2 parents 890803d + 73b39c8 commit ea3068e

File tree

2 files changed

+18
-37
lines changed

2 files changed

+18
-37
lines changed

Cargo.lock

+18-36
Original file line numberDiff line numberDiff line change
@@ -1137,13 +1137,13 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
11371137

11381138
[[package]]
11391139
name = "filetime"
1140-
version = "0.2.12"
1140+
version = "0.2.14"
11411141
source = "registry+https://github.com/rust-lang/crates.io-index"
1142-
checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
1142+
checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
11431143
dependencies = [
1144-
"cfg-if 0.1.10",
1144+
"cfg-if 1.0.0",
11451145
"libc",
1146-
"redox_syscall 0.1.57",
1146+
"redox_syscall",
11471147
"winapi 0.3.9",
11481148
]
11491149

@@ -2125,12 +2125,12 @@ dependencies = [
21252125

21262126
[[package]]
21272127
name = "measureme"
2128-
version = "9.1.0"
2128+
version = "9.1.1"
21292129
source = "registry+https://github.com/rust-lang/crates.io-index"
2130-
checksum = "4a98e07fe802486895addb2b5467f33f205e82c426bfaf350f5d8109b137767c"
2130+
checksum = "49cf14eb7d2eea897d9949b68f19e165638755e3a1a3c0941b6b6c3e00141f2c"
21312131
dependencies = [
21322132
"log",
2133-
"memmap",
2133+
"memmap2",
21342134
"parking_lot",
21352135
"perf-event-open-sys",
21362136
"rustc-hash",
@@ -2143,16 +2143,6 @@ version = "2.3.3"
21432143
source = "registry+https://github.com/rust-lang/crates.io-index"
21442144
checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
21452145

2146-
[[package]]
2147-
name = "memmap"
2148-
version = "0.7.0"
2149-
source = "registry+https://github.com/rust-lang/crates.io-index"
2150-
checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
2151-
dependencies = [
2152-
"libc",
2153-
"winapi 0.3.9",
2154-
]
2155-
21562146
[[package]]
21572147
name = "memmap2"
21582148
version = "0.2.1"
@@ -2274,7 +2264,7 @@ version = "0.3.6"
22742264
source = "registry+https://github.com/rust-lang/crates.io-index"
22752265
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
22762266
dependencies = [
2277-
"socket2 0.3.16",
2267+
"socket2 0.3.19",
22782268
"winapi 0.3.9",
22792269
]
22802270

@@ -2516,7 +2506,7 @@ dependencies = [
25162506
"cfg-if 1.0.0",
25172507
"instant",
25182508
"libc",
2519-
"redox_syscall 0.2.5",
2509+
"redox_syscall",
25202510
"smallvec",
25212511
"winapi 0.3.9",
25222512
]
@@ -3000,12 +2990,6 @@ dependencies = [
30002990
"num_cpus",
30012991
]
30022992

3003-
[[package]]
3004-
name = "redox_syscall"
3005-
version = "0.1.57"
3006-
source = "registry+https://github.com/rust-lang/crates.io-index"
3007-
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
3008-
30092993
[[package]]
30102994
name = "redox_syscall"
30112995
version = "0.2.5"
@@ -3022,7 +3006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
30223006
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
30233007
dependencies = [
30243008
"getrandom 0.2.0",
3025-
"redox_syscall 0.2.5",
3009+
"redox_syscall",
30263010
]
30273011

30283012
[[package]]
@@ -4854,13 +4838,12 @@ checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e"
48544838

48554839
[[package]]
48564840
name = "socket2"
4857-
version = "0.3.16"
4841+
version = "0.3.19"
48584842
source = "registry+https://github.com/rust-lang/crates.io-index"
4859-
checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d"
4843+
checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
48604844
dependencies = [
4861-
"cfg-if 0.1.10",
4845+
"cfg-if 1.0.0",
48624846
"libc",
4863-
"redox_syscall 0.1.57",
48644847
"winapi 0.3.9",
48654848
]
48664849

@@ -5037,13 +5020,12 @@ dependencies = [
50375020

50385021
[[package]]
50395022
name = "tar"
5040-
version = "0.4.29"
5023+
version = "0.4.33"
50415024
source = "registry+https://github.com/rust-lang/crates.io-index"
5042-
checksum = "c8a4c1d0bee3230179544336c15eefb563cf0302955d962e456542323e8c2e8a"
5025+
checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
50435026
dependencies = [
50445027
"filetime",
50455028
"libc",
5046-
"redox_syscall 0.1.57",
50475029
"xattr",
50485030
]
50495031

@@ -5056,7 +5038,7 @@ dependencies = [
50565038
"cfg-if 1.0.0",
50575039
"libc",
50585040
"rand 0.8.3",
5059-
"redox_syscall 0.2.5",
5041+
"redox_syscall",
50605042
"remove_dir_all",
50615043
"winapi 0.3.9",
50625044
]
@@ -5584,9 +5566,9 @@ dependencies = [
55845566

55855567
[[package]]
55865568
name = "version_check"
5587-
version = "0.9.1"
5569+
version = "0.9.3"
55885570
source = "registry+https://github.com/rust-lang/crates.io-index"
5589-
checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
5571+
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
55905572

55915573
[[package]]
55925574
name = "vte"

src/tools/tidy/src/deps.rs

-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
141141
"md-5",
142142
"measureme",
143143
"memchr",
144-
"memmap",
145144
"memmap2",
146145
"memoffset",
147146
"miniz_oxide",

0 commit comments

Comments
 (0)