Skip to content

Commit ce7e97f

Browse files
committed
Auto merge of #140899 - oyvindln:update_coverage_dump_deps, r=Zalathar
Update miniz_oxide dependency of coverage_dump This was the final subproject that depended on ```miniz_oxide``` 0.7.x after the rest were when updating the ```backtrace-rs``` dependency in in #140705. Older versions of ```miniz_oxide``` got hit by a [serious](#132636) performance regression in rust 1.82 (which has been worked around in more recent versions of the library) so should really be avoided if possible (granted it only affects compression so not sure if it had much impact in practice here, though there have also been some other performance improvements since .) This also means no longer having to build two versions of miniz_oxide as everything can now use the same version, and no longer needing to build both ```adler``` and ```adler2```
2 parents 3528a5b + 5bd3d0e commit ce7e97f

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

Cargo.lock

+3-18
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ dependencies = [
1111
"gimli",
1212
]
1313

14-
[[package]]
15-
name = "adler"
16-
version = "1.0.2"
17-
source = "registry+https://github.com/rust-lang/crates.io-index"
18-
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
19-
2014
[[package]]
2115
name = "adler2"
2216
version = "2.0.0"
@@ -240,7 +234,7 @@ dependencies = [
240234
"addr2line",
241235
"cfg-if",
242236
"libc",
243-
"miniz_oxide 0.8.8",
237+
"miniz_oxide",
244238
"object",
245239
"rustc-demangle",
246240
"windows-targets 0.52.6",
@@ -780,7 +774,7 @@ dependencies = [
780774
"itertools",
781775
"leb128",
782776
"md-5",
783-
"miniz_oxide 0.7.4",
777+
"miniz_oxide",
784778
"regex",
785779
"rustc-demangle",
786780
]
@@ -1220,7 +1214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12201214
checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
12211215
dependencies = [
12221216
"crc32fast",
1223-
"miniz_oxide 0.8.8",
1217+
"miniz_oxide",
12241218
]
12251219

12261220
[[package]]
@@ -2257,15 +2251,6 @@ version = "0.2.1"
22572251
source = "registry+https://github.com/rust-lang/crates.io-index"
22582252
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
22592253

2260-
[[package]]
2261-
name = "miniz_oxide"
2262-
version = "0.7.4"
2263-
source = "registry+https://github.com/rust-lang/crates.io-index"
2264-
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
2265-
dependencies = [
2266-
"adler",
2267-
]
2268-
22692254
[[package]]
22702255
name = "miniz_oxide"
22712256
version = "0.8.8"

src/tools/coverage-dump/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ anyhow = "1.0.71"
1010
itertools = "0.12"
1111
leb128 = "0.2.5"
1212
md5 = { package = "md-5" , version = "0.10.5" }
13-
miniz_oxide = "0.7.1"
13+
miniz_oxide = "0.8.8"
1414
regex = "1.8.4"
1515
rustc-demangle = "0.1.23"

0 commit comments

Comments
 (0)