Skip to content

Commit 760d8a2

Browse files
committed
Auto merge of rust-lang#99768 - klensy:bump-deps-07-22, r=Mark-Simulacrum
update few deps Updates few crates: * openssl-src v111.18.0+1.1.1n -> v111.22.0+1.1.1q: fixes few CVE's (https://www.openssl.org/news/vulnerabilities-1.1.1.html: https://cve.org/CVERecord?id=CVE-2022-1292 https://cve.org/CVERecord?id=CVE-2022-2068 https://cve.org/CVERecord?id=CVE-2022-2097) * openssl-probe v0.1.2 -> v0.1.5 updates ancient (2017) crate (alexcrichton/openssl-probe@0.1.2...0.1.5). Adds support to search cert for additional platforms. * indoc v1.0.3 -> v1.0.6 (dtolnay/indoc@1.0.3...1.0.6) Nothing special changed, removes unindent v0.1.7 * bstr v0.2.13 -> v0.2.17 (BurntSushi/bstr@0.2.13...0.2.17) Few speedups (BurntSushi/bstr@8e65992, BurntSushi/bstr@5fcef91) and bugfix (BurntSushi/bstr@b2111b6) * crc32fast v1.2.0 -> v1.3.2 (srijs/rust-crc32fast@v1.2.0...v1.3.2) Speedup debug (srijs/rust-crc32fast@e61ce6a) * diff v0.1.12 -> v0.1.13 (utkarshkukreti/diff.rs@0.1.12...0.1.13) Few optimizations (utkarshkukreti/diff.rs#16, utkarshkukreti/diff.rs@0f0aa58) * ignore v0.4.17 -> v0.4.18 (it's hard to get usable diff, but most notable perf change is BurntSushi/ripgrep@a28e664) * globset v0.4.5 -> v0.4.9 * regex v1.5.5 -> v1.5.6 few bugfixes (https://github.com/rust-lang/regex/blob/1.5.6/CHANGELOG.md#156-2022-05-20). There exist 1.6.0 version, but it's too fresh.
2 parents bd84c73 + 2787d42 commit 760d8a2

File tree

2 files changed

+28
-32
lines changed

2 files changed

+28
-32
lines changed

Cargo.lock

+22-30
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ dependencies = [
247247

248248
[[package]]
249249
name = "bstr"
250-
version = "0.2.13"
250+
version = "0.2.17"
251251
source = "registry+https://github.com/rust-lang/crates.io-index"
252-
checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
252+
checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
253253
dependencies = [
254254
"lazy_static",
255255
"memchr",
@@ -935,11 +935,11 @@ dependencies = [
935935

936936
[[package]]
937937
name = "crc32fast"
938-
version = "1.2.0"
938+
version = "1.3.2"
939939
source = "registry+https://github.com/rust-lang/crates.io-index"
940-
checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
940+
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
941941
dependencies = [
942-
"cfg-if 0.1.10",
942+
"cfg-if 1.0.0",
943943
]
944944

945945
[[package]]
@@ -1112,9 +1112,9 @@ dependencies = [
11121112

11131113
[[package]]
11141114
name = "diff"
1115-
version = "0.1.12"
1115+
version = "0.1.13"
11161116
source = "registry+https://github.com/rust-lang/crates.io-index"
1117-
checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
1117+
checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
11181118

11191119
[[package]]
11201120
name = "difference"
@@ -1691,9 +1691,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
16911691

16921692
[[package]]
16931693
name = "globset"
1694-
version = "0.4.5"
1694+
version = "0.4.9"
16951695
source = "registry+https://github.com/rust-lang/crates.io-index"
1696-
checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120"
1696+
checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
16971697
dependencies = [
16981698
"aho-corasick",
16991699
"bstr",
@@ -1850,9 +1850,9 @@ checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d"
18501850

18511851
[[package]]
18521852
name = "ignore"
1853-
version = "0.4.17"
1853+
version = "0.4.18"
18541854
source = "registry+https://github.com/rust-lang/crates.io-index"
1855-
checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
1855+
checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
18561856
dependencies = [
18571857
"crossbeam-utils",
18581858
"globset",
@@ -1900,12 +1900,9 @@ dependencies = [
19001900

19011901
[[package]]
19021902
name = "indoc"
1903-
version = "1.0.3"
1903+
version = "1.0.6"
19041904
source = "registry+https://github.com/rust-lang/crates.io-index"
1905-
checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
1906-
dependencies = [
1907-
"unindent",
1908-
]
1905+
checksum = "05a0bd019339e5d968b37855180087b7b9d512c5046fbd244cf8c95687927d6e"
19091906

19101907
[[package]]
19111908
name = "installer"
@@ -2628,15 +2625,15 @@ dependencies = [
26282625

26292626
[[package]]
26302627
name = "openssl-probe"
2631-
version = "0.1.2"
2628+
version = "0.1.5"
26322629
source = "registry+https://github.com/rust-lang/crates.io-index"
2633-
checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
2630+
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
26342631

26352632
[[package]]
26362633
name = "openssl-src"
2637-
version = "111.18.0+1.1.1n"
2634+
version = "111.22.0+1.1.1q"
26382635
source = "registry+https://github.com/rust-lang/crates.io-index"
2639-
checksum = "7897a926e1e8d00219127dc020130eca4292e5ca666dd592480d72c3eca2ff6c"
2636+
checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
26402637
dependencies = [
26412638
"cc",
26422639
]
@@ -3261,9 +3258,9 @@ dependencies = [
32613258

32623259
[[package]]
32633260
name = "regex"
3264-
version = "1.5.5"
3261+
version = "1.5.6"
32653262
source = "registry+https://github.com/rust-lang/crates.io-index"
3266-
checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
3263+
checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
32673264
dependencies = [
32683265
"aho-corasick",
32693266
"memchr",
@@ -3281,9 +3278,9 @@ dependencies = [
32813278

32823279
[[package]]
32833280
name = "regex-syntax"
3284-
version = "0.6.25"
3281+
version = "0.6.26"
32853282
source = "registry+https://github.com/rust-lang/crates.io-index"
3286-
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
3283+
checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
32873284

32883285
[[package]]
32893286
name = "remote-test-client"
@@ -3529,6 +3526,7 @@ dependencies = [
35293526
"crossbeam-utils",
35303527
"libc",
35313528
"libz-sys",
3529+
"memchr",
35323530
"proc-macro2",
35333531
"quote",
35343532
"rand_core 0.5.1",
@@ -5697,12 +5695,6 @@ dependencies = [
56975695
"diff",
56985696
]
56995697

5700-
[[package]]
5701-
name = "unindent"
5702-
version = "0.1.7"
5703-
source = "registry+https://github.com/rust-lang/crates.io-index"
5704-
checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
5705-
57065698
[[package]]
57075699
name = "unstable-book-gen"
57085700
version = "0.1.0"

src/tools/rustc-workspace-hack/Cargo.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,20 @@ features = [
7171
]
7272

7373
[dependencies]
74-
bstr = { version = "0.2.13", features = ["default"] }
74+
bstr = { version = "0.2.17", features = ["default"] }
7575
byteorder = { version = "1", features = ['default', 'std'] }
7676
clap = { version = "3.1.1", features = ["derive", "clap_derive"]}
7777
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
7878
crossbeam-utils = { version = "0.8.0", features = ["nightly"] }
7979
libc = { version = "0.2.79", features = ["align"] }
8080
# Ensure default features of libz-sys, which are disabled in some scenarios.
8181
libz-sys = { version = "1.1.2" }
82+
83+
# looks like the only user of deprecated `use_std` feature is `combine`, so this
84+
# can be removed if/when https://github.com/Marwes/combine/pull/348 be merged and released.
85+
memchr = { version = "2.5", features = ["std", "use_std"] }
8286
# same for regex
83-
regex = { version = "1.5.5" }
87+
regex = { version = "1.5.6" }
8488
proc-macro2 = { version = "1", features = ["default"] }
8589
quote = { version = "1", features = ["default"] }
8690
rand_core_0_5 = { package = "rand_core", version = "0.5.1", features = ["getrandom", "alloc", "std"] }

0 commit comments

Comments
 (0)