Merge pull request #11179 from rust-lang/renovate/zip-3.x

Turbo87 · web-flow · commit affac62c816d · 2025-05-16T11:03:37.000+02:00
Update Rust crate zip to v3
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -150,4 +150,4 @@ insta = { version = "=1.43.1", features = ["glob", "json", "redactions"] }
 regex = "=1.11.1"
 sentry = { version = "=0.38.1", features = ["test"] }
 tokio = "=1.45.0"
-zip = { version = "=2.6.1", default-features = false, features = ["deflate"] }
+zip = { version = "=3.0.0", default-features = false, features = ["deflate"] }
diff --git a/crates/crates_io_database_dump/Cargo.toml b/crates/crates_io_database_dump/Cargo.toml
@@ -18,7 +18,7 @@ tar = "=0.4.44"
 tempfile = "=3.20.0"
 toml = "=0.8.22"
 tracing = "=0.1.41"
-zip = { version = "=2.6.1", default-features = false, features = ["deflate"] }
+zip = { version = "=3.0.0", default-features = false, features = ["deflate"] }
 
 [dev-dependencies]
 crates_io_test_db = { path = "../crates_io_test_db" }
diff --git a/deny.toml b/deny.toml
@@ -108,6 +108,7 @@ allow = [
     "MIT",
     "MPL-2.0",
     "Unicode-3.0",
+    "Zlib",
 ]
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate-2.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate-2.snap
@@ -7,7 +7,7 @@ expression: crates
     "name": "foo_new",
     "vers": "1.0.0",
     "deps": [],
-    "cksum": "270bbe1624abd766746bf9938b791fadd88e7e0135339510837e11b45e167350",
+    "cksum": "696b8fc0b2d62c399459b2000dbcab7d9914e5dfafff974f53c1212e02f014bb",
     "features": {},
     "yanked": false
   }
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice-2.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice-2.snap
@@ -7,15 +7,15 @@ expression: crates
     "name": "foo_twice",
     "vers": "0.99.0",
     "deps": [],
-    "cksum": "45b0b19cd0280034e07820789d9bb6e4016526eba85c75fc697d49ec99fd2550",
+    "cksum": "99ef473e84e6bede426d948d4dca03d79a64acb51511ffcbeb11d253505c9968",
     "features": {},
     "yanked": false
   },
   {
     "name": "foo_twice",
     "vers": "2.0.0",
     "deps": [],
-    "cksum": "d6e88a7d30b9e5c3d268ede9a9937b62815e45a06fd2c572d602e0705ab6513d",
+    "cksum": "7e71c271648114db81fa41450dd8d4d50c35622d3630e65c4f8211948bdf83f3",
     "features": {},
     "yanked": false
   }
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice_alt-2.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice_alt-2.snap
@@ -7,15 +7,15 @@ expression: crates
     "name": "foo_twice",
     "vers": "2.0.0",
     "deps": [],
-    "cksum": "d6e88a7d30b9e5c3d268ede9a9937b62815e45a06fd2c572d602e0705ab6513d",
+    "cksum": "7e71c271648114db81fa41450dd8d4d50c35622d3630e65c4f8211948bdf83f3",
     "features": {},
     "yanked": false
   },
   {
     "name": "foo_twice",
     "vers": "0.99.0",
     "deps": [],
-    "cksum": "45b0b19cd0280034e07820789d9bb6e4016526eba85c75fc697d49ec99fd2550",
+    "cksum": "99ef473e84e6bede426d948d4dca03d79a64acb51511ffcbeb11d253505c9968",
     "features": {},
     "yanked": false
   }
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_krate_sorts_deps.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_krate_sorts_deps.snap
@@ -26,7 +26,7 @@ expression: crates
         "kind": "normal"
       }
     ],
-    "cksum": "e2366ac311619de0f137a23f8a88e2b2cc32a6986514fe67b426d5a9f83468fa",
+    "cksum": "8d88a5d9d97c440d32d2f8542395975effc3605b98e076a15f4023a004536ed8",
     "features": {},
     "yanked": false
   }
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_krate_with_dependency.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_krate_with_dependency.snap
@@ -17,7 +17,7 @@ expression: crates
         "kind": "normal"
       }
     ],
-    "cksum": "b1ce14dbe59036a964369747770d2d64695039065384b1ab56f09a59525300a6",
+    "cksum": "5503e734eb2fdc003688c5a275d4a6d8cd2a82135eb37befbda449feb8ea1800",
     "features": {},
     "yanked": false
   }
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_with_renamed_dependency.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_with_renamed_dependency.snap
@@ -18,7 +18,7 @@ expression: crates
         "package": "package-name"
       }
     ],
-    "cksum": "78d9041c5262f137144a77dea8579e6281ff110b44fe7c4654f6ca132cccccaf",
+    "cksum": "f45e830a39be59e75f1d5c63a3c05856e0d68da52e0e00006b865327edd33431",
     "features": {},
     "yanked": false
   }
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_with_underscore_renamed_dependency.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__new_with_underscore_renamed_dependency.snap
@@ -18,7 +18,7 @@ expression: crates
         "package": "package-name"
       }
     ],
-    "cksum": "a53250c08af1d1cc060bc5145afadfd0b07708406d8943ae1d6b76131d78955f",
+    "cksum": "608b7a65a1292ef1de0fc4c453b0ec978c93bc36a11eb0b12cd301ab55c3a760",
     "features": {},
     "yanked": false
   }
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__edition__edition_is_saved-2.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__edition__edition_is_saved-2.snap
@@ -18,9 +18,9 @@ expression: response.json()
       }
     ],
     "bin_names": [],
-    "checksum": "7bca599a373dd56631d8c47704f17d2c166e75ffc7327c6dcc54c91e3d290e5b",
+    "checksum": "7008c5c6b6cbf418070a998fad244bbde3ca712148e61e4d4b0d257682e30ad2",
     "crate": "foo",
-    "crate_size": 169,
+    "crate_size": 172,
     "created_at": "[datetime]",
     "description": "description",
     "dl_path": "/api/v1/crates/foo/1.0.0/download",
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_start_with_number_and_underscore.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_start_with_number_and_underscore.snap
@@ -7,7 +7,7 @@ expression: crates
     "name": "foo",
     "vers": "1.0.0",
     "deps": [],
-    "cksum": "6f73fad556c46cdb740173ccc7a5f5bf64b8d954966be16963a08eb138e3c69c",
+    "cksum": "ee98333f656a2a5f7b21a3b8f50313a8f5f1e7333f37a5dc7537ff5877d286ef",
     "features": {
       "0foo1.bar": [],
       "_foo2.bar": []
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_with_dot.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_with_dot.snap
@@ -7,7 +7,7 @@ expression: crates
     "name": "foo",
     "vers": "1.0.0",
     "deps": [],
-    "cksum": "d0bfdbcd4905a15b3dc6db5ce23e206ac413b4d780053fd38e145a75197fb1e1",
+    "cksum": "27dd07372333f362aa95ec0d2c1eb1027210edc57c8ab93d065d309a01b08de7",
     "features": {
       "foo.bar": []
     },
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_with_unicode_chars.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__feature_name_with_unicode_chars.snap
@@ -7,7 +7,7 @@ expression: crates
     "name": "foo",
     "vers": "1.0.0",
     "deps": [],
-    "cksum": "493720846371607438c1a4eb90c9cc7d7286600ca9c4e2ca04151aad9563b47a",
+    "cksum": "12368623e4c78ae9412ec9a046ed915745bc7901a935ac2a01086ce33064180d",
     "features": {
       "foo.你好世界": []
     },
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__features_version_2.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__features__features_version_2.snap
@@ -17,7 +17,7 @@ expression: crates
         "kind": "normal"
       }
     ],
-    "cksum": "a5e630c00549b2e92e874128eb6b6696537234fcd17c75045c5cadef07ba114d",
+    "cksum": "2afc013f11f59e88e299edb2e6e1c173435b91a164e19e74842a096bca9f68f8",
     "features": {
       "old_feat": []
     },
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__links__crate_with_links_field-2.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__links__crate_with_links_field-2.snap
@@ -18,9 +18,9 @@ expression: response.json()
       }
     ],
     "bin_names": [],
-    "checksum": "5631ca06d228e58274bbd8d6a3e81f7138a9e227a84bd63ecedb78afbc8144ea",
+    "checksum": "b2c9e153a8860ce92ba7cbdea7b718409d181c08f4c6c5c2a612919dcb155af2",
     "crate": "foo",
-    "crate_size": 162,
+    "crate_size": 167,
     "created_at": "[datetime]",
     "description": "foo?!",
     "dl_path": "/api/v1/crates/foo/1.0.0/download",
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__links__crate_with_links_field-3.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__links__crate_with_links_field-3.snap
@@ -7,7 +7,7 @@ expression: crates
     "name": "foo",
     "vers": "1.0.0",
     "deps": [],
-    "cksum": "5631ca06d228e58274bbd8d6a3e81f7138a9e227a84bd63ecedb78afbc8144ea",
+    "cksum": "b2c9e153a8860ce92ba7cbdea7b718409d181c08f4c6c5c2a612919dcb155af2",
     "features": {},
     "yanked": false,
     "links": "git2"
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__manifest__boolean_readme-2.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__manifest__boolean_readme-2.snap
@@ -18,9 +18,9 @@ expression: response.json()
       }
     ],
     "bin_names": [],
-    "checksum": "418c24c55cbcde274a5b1815d2c844203c7116e7f712008f4727d38bc7c82d8d",
+    "checksum": "50da036cb5dfa54c39ab25c02c31ca001fa103b4de41e3f79ca1d3b6877c775f",
     "crate": "foo",
-    "crate_size": 170,
+    "crate_size": 173,
     "created_at": "[datetime]",
     "description": "description",
     "dl_path": "/api/v1/crates/foo/1.0.0/download",
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__manifest__lib_and_bin_crate-2.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__manifest__lib_and_bin_crate-2.snap
@@ -21,9 +21,9 @@ expression: response.json()
       "bar",
       "foo"
     ],
-    "checksum": "ed125a8d83193391762787872f6363ef11d472fe9e963b984a761f970d63a7a8",
+    "checksum": "2af566e52c8fb0376558a00b0bc426c699e8fe2b12807b75cbce7ccf54e37a98",
     "crate": "foo",
-    "crate_size": 241,
+    "crate_size": 251,
     "created_at": "[datetime]",
     "description": "description",
     "dl_path": "/api/v1/crates/foo/1.0.0/download",
diff --git a/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-2.snap b/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-2.snap
@@ -22,7 +22,7 @@ expression: json
       "version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
       "authors": "/api/v1/crates/patchable/1.0.0/authors"
     },
-    "crate_size": 151,
+    "crate_size": 156,
     "published_by": {
       "id": 1,
       "login": "foo",
@@ -54,7 +54,7 @@ expression: json
         "time": "[datetime]"
       }
     ],
-    "checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
+    "checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
     "rust_version": null,
     "has_lib": false,
     "bin_names": [],
diff --git a/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-3.snap b/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-3.snap
@@ -22,7 +22,7 @@ expression: json
       "version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
       "authors": "/api/v1/crates/patchable/1.0.0/authors"
     },
-    "crate_size": 151,
+    "crate_size": 156,
     "published_by": {
       "id": 1,
       "login": "foo",
@@ -65,7 +65,7 @@ expression: json
         "time": "[datetime]"
       }
     ],
-    "checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
+    "checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
     "rust_version": null,
     "has_lib": false,
     "bin_names": [],
diff --git a/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-4.snap b/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-4.snap
@@ -22,7 +22,7 @@ expression: json
       "version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
       "authors": "/api/v1/crates/patchable/1.0.0/authors"
     },
-    "crate_size": 151,
+    "crate_size": 156,
     "published_by": {
       "id": 1,
       "login": "foo",
@@ -65,7 +65,7 @@ expression: json
         "time": "[datetime]"
       }
     ],
-    "checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
+    "checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
     "rust_version": null,
     "has_lib": false,
     "bin_names": [],
diff --git a/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-5.snap b/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-5.snap
@@ -22,7 +22,7 @@ expression: json
       "version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
       "authors": "/api/v1/crates/patchable/1.0.0/authors"
     },
-    "crate_size": 151,
+    "crate_size": 156,
     "published_by": {
       "id": 1,
       "login": "foo",
@@ -76,7 +76,7 @@ expression: json
         "time": "[datetime]"
       }
     ],
-    "checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
+    "checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
     "rust_version": null,
     "has_lib": false,
     "bin_names": [],
diff --git a/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-6.snap b/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank-6.snap
@@ -22,7 +22,7 @@ expression: json
       "version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
       "authors": "/api/v1/crates/patchable/1.0.0/authors"
     },
-    "crate_size": 151,
+    "crate_size": 156,
     "published_by": {
       "id": 1,
       "login": "foo",
@@ -76,7 +76,7 @@ expression: json
         "time": "[datetime]"
       }
     ],
-    "checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
+    "checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
     "rust_version": null,
     "has_lib": false,
     "bin_names": [],
diff --git a/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank.snap b/src/tests/krate/snapshots/crates_io__tests__krate__yanking__patch_version_yank_unyank.snap
@@ -22,7 +22,7 @@ expression: json
       "version_downloads": "/api/v1/crates/patchable/1.0.0/downloads",
       "authors": "/api/v1/crates/patchable/1.0.0/authors"
     },
-    "crate_size": 151,
+    "crate_size": 156,
     "published_by": {
       "id": 1,
       "login": "foo",
@@ -54,7 +54,7 @@ expression: json
         "time": "[datetime]"
       }
     ],
-    "checksum": "ddfc395ab340f413ee1d1ed0afce51a7c9df1c99c551fed5aef76edd4abe4048",
+    "checksum": "d4d2d515985c394dc9fa95c56b935ab0805f6dfbd91a6dc99af9d316dff96dc0",
     "rust_version": null,
     "has_lib": false,
     "bin_names": [],
diff --git a/src/tests/routes/crates/read.rs b/src/tests/routes/crates/read.rs
@@ -135,7 +135,7 @@ async fn version_size() {
         .iter()
         .find(|v| v.num == "1.0.0")
         .expect("Could not find v1.0.0");
-    assert_eq!(version1.crate_size, 158);
+    assert_eq!(version1.crate_size, 160);
 
     let version2 = crate_json
         .versions
@@ -144,7 +144,7 @@ async fn version_size() {
         .iter()
         .find(|v| v.num == "2.0.0")
         .expect("Could not find v2.0.0");
-    assert_eq!(version2.crate_size, 184);
+    assert_eq!(version2.crate_size, 191);
 }
 
 #[tokio::test(flavor = "multi_thread")]

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ allow = [`
`108`	`108`	`"MIT",`
`109`	`109`	`"MPL-2.0",`
`110`	`110`	`"Unicode-3.0",`
	`111`	`+ "Zlib",`
`111`	`112`	`]`
`112`	`113`	`# The confidence threshold for detecting a license from license text.`
`113`	`114`	`# The higher the value, the more closely the license text must be to the`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ expression: crates`
`7`	`7`	`"name": "foo_new",`
`8`	`8`	`"vers": "1.0.0",`
`9`	`9`	`"deps": [],`
`10`		`- "cksum": "270bbe1624abd766746bf9938b791fadd88e7e0135339510837e11b45e167350",`
	`10`	`+ "cksum": "696b8fc0b2d62c399459b2000dbcab7d9914e5dfafff974f53c1212e02f014bb",`
`11`	`11`	`"features": {},`
`12`	`12`	`"yanked": false`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ expression: crates`
`26`	`26`	`"kind": "normal"`
`27`	`27`	`}`
`28`	`28`	`],`
`29`		`- "cksum": "e2366ac311619de0f137a23f8a88e2b2cc32a6986514fe67b426d5a9f83468fa",`
	`29`	`+ "cksum": "8d88a5d9d97c440d32d2f8542395975effc3605b98e076a15f4023a004536ed8",`
`30`	`30`	`"features": {},`
`31`	`31`	`"yanked": false`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ expression: crates`
`17`	`17`	`"kind": "normal"`
`18`	`18`	`}`
`19`	`19`	`],`
`20`		`- "cksum": "b1ce14dbe59036a964369747770d2d64695039065384b1ab56f09a59525300a6",`
	`20`	`+ "cksum": "5503e734eb2fdc003688c5a275d4a6d8cd2a82135eb37befbda449feb8ea1800",`
`21`	`21`	`"features": {},`
`22`	`22`	`"yanked": false`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ expression: crates`
`18`	`18`	`"package": "package-name"`
`19`	`19`	`}`
`20`	`20`	`],`
`21`		`- "cksum": "78d9041c5262f137144a77dea8579e6281ff110b44fe7c4654f6ca132cccccaf",`
	`21`	`+ "cksum": "f45e830a39be59e75f1d5c63a3c05856e0d68da52e0e00006b865327edd33431",`
`22`	`22`	`"features": {},`
`23`	`23`	`"yanked": false`
`24`	`24`	`}`