Skip to content

Commit affac62

Browse files
authored
Merge pull request #11179 from rust-lang/renovate/zip-3.x
Update Rust crate zip to v3
2 parents 6950bdf + 08327af commit affac62

File tree

27 files changed

+57
-41
lines changed

27 files changed

+57
-41
lines changed

Cargo.lock

Lines changed: 18 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,4 @@ insta = { version = "=1.43.1", features = ["glob", "json", "redactions"] }
150150
regex = "=1.11.1"
151151
sentry = { version = "=0.38.1", features = ["test"] }
152152
tokio = "=1.45.0"
153-
zip = { version = "=2.6.1", default-features = false, features = ["deflate"] }
153+
zip = { version = "=3.0.0", default-features = false, features = ["deflate"] }

crates/crates_io_database_dump/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tar = "=0.4.44"
1818
tempfile = "=3.20.0"
1919
toml = "=0.8.22"
2020
tracing = "=0.1.41"
21-
zip = { version = "=2.6.1", default-features = false, features = ["deflate"] }
21+
zip = { version = "=3.0.0", default-features = false, features = ["deflate"] }
2222

2323
[dev-dependencies]
2424
crates_io_test_db = { path = "../crates_io_test_db" }

deny.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ allow = [
108108
"MIT",
109109
"MPL-2.0",
110110
"Unicode-3.0",
111+
"Zlib",
111112
]
112113
# The confidence threshold for detecting a license from license text.
113114
# The higher the value, the more closely the license text must be to the

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate-2.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ expression: crates
77
"name": "foo_new",
88
"vers": "1.0.0",
99
"deps": [],
10-
"cksum": "270bbe1624abd766746bf9938b791fadd88e7e0135339510837e11b45e167350",
10+
"cksum": "696b8fc0b2d62c399459b2000dbcab7d9914e5dfafff974f53c1212e02f014bb",
1111
"features": {},
1212
"yanked": false
1313
}

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ expression: crates
77
"name": "foo_twice",
88
"vers": "0.99.0",
99
"deps": [],
10-
"cksum": "45b0b19cd0280034e07820789d9bb6e4016526eba85c75fc697d49ec99fd2550",
10+
"cksum": "99ef473e84e6bede426d948d4dca03d79a64acb51511ffcbeb11d253505c9968",
1111
"features": {},
1212
"yanked": false
1313
},
1414
{
1515
"name": "foo_twice",
1616
"vers": "2.0.0",
1717
"deps": [],
18-
"cksum": "d6e88a7d30b9e5c3d268ede9a9937b62815e45a06fd2c572d602e0705ab6513d",
18+
"cksum": "7e71c271648114db81fa41450dd8d4d50c35622d3630e65c4f8211948bdf83f3",
1919
"features": {},
2020
"yanked": false
2121
}

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice_alt-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ expression: crates
77
"name": "foo_twice",
88
"vers": "2.0.0",
99
"deps": [],
10-
"cksum": "d6e88a7d30b9e5c3d268ede9a9937b62815e45a06fd2c572d602e0705ab6513d",
10+
"cksum": "7e71c271648114db81fa41450dd8d4d50c35622d3630e65c4f8211948bdf83f3",
1111
"features": {},
1212
"yanked": false
1313
},
1414
{
1515
"name": "foo_twice",
1616
"vers": "0.99.0",
1717
"deps": [],
18-
"cksum": "45b0b19cd0280034e07820789d9bb6e4016526eba85c75fc697d49ec99fd2550",
18+
"cksum": "99ef473e84e6bede426d948d4dca03d79a64acb51511ffcbeb11d253505c9968",
1919
"features": {},
2020
"yanked": false
2121
}

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_krate_sorts_deps.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ expression: crates
2626
"kind": "normal"
2727
}
2828
],
29-
"cksum": "e2366ac311619de0f137a23f8a88e2b2cc32a6986514fe67b426d5a9f83468fa",
29+
"cksum": "8d88a5d9d97c440d32d2f8542395975effc3605b98e076a15f4023a004536ed8",
3030
"features": {},
3131
"yanked": false
3232
}

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_krate_with_dependency.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ expression: crates
1717
"kind": "normal"
1818
}
1919
],
20-
"cksum": "b1ce14dbe59036a964369747770d2d64695039065384b1ab56f09a59525300a6",
20+
"cksum": "5503e734eb2fdc003688c5a275d4a6d8cd2a82135eb37befbda449feb8ea1800",
2121
"features": {},
2222
"yanked": false
2323
}

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_with_renamed_dependency.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ expression: crates
1818
"package": "package-name"
1919
}
2020
],
21-
"cksum": "78d9041c5262f137144a77dea8579e6281ff110b44fe7c4654f6ca132cccccaf",
21+
"cksum": "f45e830a39be59e75f1d5c63a3c05856e0d68da52e0e00006b865327edd33431",
2222
"features": {},
2323
"yanked": false
2424
}

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_with_underscore_renamed_dependency.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ expression: crates
1818
"package": "package-name"
1919
}
2020
],
21-
"cksum": "a53250c08af1d1cc060bc5145afadfd0b07708406d8943ae1d6b76131d78955f",
21+
"cksum": "608b7a65a1292ef1de0fc4c453b0ec978c93bc36a11eb0b12cd301ab55c3a760",
2222
"features": {},
2323
"yanked": false
2424
}

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__edition__edition_is_saved-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ expression: response.json()
1818
}
1919
],
2020
"bin_names": [],
21-
"checksum": "7bca599a373dd56631d8c47704f17d2c166e75ffc7327c6dcc54c91e3d290e5b",
21+
"checksum": "7008c5c6b6cbf418070a998fad244bbde3ca712148e61e4d4b0d257682e30ad2",
2222
"crate": "foo",
23-
"crate_size": 169,
23+
"crate_size": 172,
2424
"created_at": "[datetime]",
2525
"description": "description",
2626
"dl_path": "/api/v1/crates/foo/1.0.0/download",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_start_with_number_and_underscore.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ expression: crates
77
"name": "foo",
88
"vers": "1.0.0",
99
"deps": [],
10-
"cksum": "6f73fad556c46cdb740173ccc7a5f5bf64b8d954966be16963a08eb138e3c69c",
10+
"cksum": "ee98333f656a2a5f7b21a3b8f50313a8f5f1e7333f37a5dc7537ff5877d286ef",
1111
"features": {
1212
"0foo1.bar": [],
1313
"_foo2.bar": []

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_with_dot.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ expression: crates
77
"name": "foo",
88
"vers": "1.0.0",
99
"deps": [],
10-
"cksum": "d0bfdbcd4905a15b3dc6db5ce23e206ac413b4d780053fd38e145a75197fb1e1",
10+
"cksum": "27dd07372333f362aa95ec0d2c1eb1027210edc57c8ab93d065d309a01b08de7",
1111
"features": {
1212
"foo.bar": []
1313
},

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_with_unicode_chars.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ expression: crates
77
"name": "foo",
88
"vers": "1.0.0",
99
"deps": [],
10-
"cksum": "493720846371607438c1a4eb90c9cc7d7286600ca9c4e2ca04151aad9563b47a",
10+
"cksum": "12368623e4c78ae9412ec9a046ed915745bc7901a935ac2a01086ce33064180d",
1111
"features": {
1212
"foo.你好世界": []
1313
},

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__features_version_2.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ expression: crates
1717
"kind": "normal"
1818
}
1919
],
20-
"cksum": "a5e630c00549b2e92e874128eb6b6696537234fcd17c75045c5cadef07ba114d",
20+
"cksum": "2afc013f11f59e88e299edb2e6e1c173435b91a164e19e74842a096bca9f68f8",
2121
"features": {
2222
"old_feat": []
2323
},

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__links__crate_with_links_field-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ expression: response.json()
1818
}
1919
],
2020
"bin_names": [],
21-
"checksum": "5631ca06d228e58274bbd8d6a3e81f7138a9e227a84bd63ecedb78afbc8144ea",
21+
"checksum": "b2c9e153a8860ce92ba7cbdea7b718409d181c08f4c6c5c2a612919dcb155af2",
2222
"crate": "foo",
23-
"crate_size": 162,
23+
"crate_size": 167,
2424
"created_at": "[datetime]",
2525
"description": "foo?!",
2626
"dl_path": "/api/v1/crates/foo/1.0.0/download",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__links__crate_with_links_field-3.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ expression: crates
77
"name": "foo",
88
"vers": "1.0.0",
99
"deps": [],
10-
"cksum": "5631ca06d228e58274bbd8d6a3e81f7138a9e227a84bd63ecedb78afbc8144ea",
10+
"cksum": "b2c9e153a8860ce92ba7cbdea7b718409d181c08f4c6c5c2a612919dcb155af2",
1111
"features": {},
1212
"yanked": false,
1313
"links": "git2"

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__manifest__boolean_readme-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ expression: response.json()
1818
}
1919
],
2020
"bin_names": [],
21-
"checksum": "418c24c55cbcde274a5b1815d2c844203c7116e7f712008f4727d38bc7c82d8d",
21+
"checksum": "50da036cb5dfa54c39ab25c02c31ca001fa103b4de41e3f79ca1d3b6877c775f",
2222
"crate": "foo",
23-
"crate_size": 170,
23+
"crate_size": 173,
2424
"created_at": "[datetime]",
2525
"description": "description",
2626
"dl_path": "/api/v1/crates/foo/1.0.0/download",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__manifest__lib_and_bin_crate-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ expression: response.json()
2121
"bar",
2222
"foo"
2323
],
24-
"checksum": "ed125a8d83193391762787872f6363ef11d472fe9e963b984a761f970d63a7a8",
24+
"checksum": "2af566e52c8fb0376558a00b0bc426c699e8fe2b12807b75cbce7ccf54e37a98",
2525
"crate": "foo",
26-
"crate_size": 241,
26+
"crate_size": 251,
2727
"created_at": "[datetime]",
2828
"description": "description",
2929
"dl_path": "/api/v1/crates/foo/1.0.0/download",

src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ expression: json
2222
"version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
2323
"authors": "/api/v1/crates/patchable/1.0.0/authors"
2424
},
25-
"crate_size": 151,
25+
"crate_size": 156,
2626
"published_by": {
2727
"id": 1,
2828
"login": "foo",
@@ -54,7 +54,7 @@ expression: json
5454
"time": "[datetime]"
5555
}
5656
],
57-
"checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
57+
"checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
5858
"rust_version": null,
5959
"has_lib": false,
6060
"bin_names": [],

src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-3.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ expression: json
2222
"version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
2323
"authors": "/api/v1/crates/patchable/1.0.0/authors"
2424
},
25-
"crate_size": 151,
25+
"crate_size": 156,
2626
"published_by": {
2727
"id": 1,
2828
"login": "foo",
@@ -65,7 +65,7 @@ expression: json
6565
"time": "[datetime]"
6666
}
6767
],
68-
"checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
68+
"checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
6969
"rust_version": null,
7070
"has_lib": false,
7171
"bin_names": [],

src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-4.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ expression: json
2222
"version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
2323
"authors": "/api/v1/crates/patchable/1.0.0/authors"
2424
},
25-
"crate_size": 151,
25+
"crate_size": 156,
2626
"published_by": {
2727
"id": 1,
2828
"login": "foo",
@@ -65,7 +65,7 @@ expression: json
6565
"time": "[datetime]"
6666
}
6767
],
68-
"checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
68+
"checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
6969
"rust_version": null,
7070
"has_lib": false,
7171
"bin_names": [],

src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-5.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ expression: json
2222
"version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
2323
"authors": "/api/v1/crates/patchable/1.0.0/authors"
2424
},
25-
"crate_size": 151,
25+
"crate_size": 156,
2626
"published_by": {
2727
"id": 1,
2828
"login": "foo",
@@ -76,7 +76,7 @@ expression: json
7676
"time": "[datetime]"
7777
}
7878
],
79-
"checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
79+
"checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
8080
"rust_version": null,
8181
"has_lib": false,
8282
"bin_names": [],

src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-6.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ expression: json
2222
"version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
2323
"authors": "/api/v1/crates/patchable/1.0.0/authors"
2424
},
25-
"crate_size": 151,
25+
"crate_size": 156,
2626
"published_by": {
2727
"id": 1,
2828
"login": "foo",
@@ -76,7 +76,7 @@ expression: json
7676
"time": "[datetime]"
7777
}
7878
],
79-
"checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
79+
"checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
8080
"rust_version": null,
8181
"has_lib": false,
8282
"bin_names": [],

src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ expression: json
2222
"version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
2323
"authors": "/api/v1/crates/patchable/1.0.0/authors"
2424
},
25-
"crate_size": 151,
25+
"crate_size": 156,
2626
"published_by": {
2727
"id": 1,
2828
"login": "foo",
@@ -54,7 +54,7 @@ expression: json
5454
"time": "[datetime]"
5555
}
5656
],
57-
"checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
57+
"checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
5858
"rust_version": null,
5959
"has_lib": false,
6060
"bin_names": [],

src/tests/routes/crates/read.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ async fn version_size() {
135135
.iter()
136136
.find(|v| v.num == "1.0.0")
137137
.expect("Could not find v1.0.0");
138-
assert_eq!(version1.crate_size, 158);
138+
assert_eq!(version1.crate_size, 160);
139139

140140
let version2 = crate_json
141141
.versions
@@ -144,7 +144,7 @@ async fn version_size() {
144144
.iter()
145145
.find(|v| v.num == "2.0.0")
146146
.expect("Could not find v2.0.0");
147-
assert_eq!(version2.crate_size, 184);
147+
assert_eq!(version2.crate_size, 191);
148148
}
149149

150150
#[tokio::test(flavor = "multi_thread")]

0 commit comments

Comments
 (0)