Upgrade to zip 4, which uses zlib-rs by default

Josh Triplett committed 1 year ago

Commit e768c941 parent 00bd1fa3 files · +49 −69Browse files

Unified · Split

3 files

Cargo.lock +46 −65
gix-archive/Cargo.toml +2 −3
gix-archive/src/write.rs +1 −1

@@ -13,9 +13,9 @@ dependencies = [ · 12 unmodified lines
13	13
14	14	[[package]]
15	15	name = "adler2"
16		−version = "2.0.0"
	16	+version = "2.0.1"
17	17	source = "registry+https://github.com/rust-lang/crates.io-index"
18		−checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
	18	+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
19	19
20	20	[[package]]
21	21	name = "aho-corasick"
@@ -274,7 +274,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" · 252 unmodified lines
274	274	dependencies = [
275	275	"proc-macro2",
276	276	"quote",
277		− "syn 2.0.101",
	277	+ "syn 2.0.103",
278	278	]
279	279
280	280	[[package]]
@@ -352,7 +352,7 @@ dependencies = [ · 71 unmodified lines
352	352	"regex",
353	353	"rustc-hash 1.1.0",
354	354	"shlex",
355		− "syn 2.0.101",
	355	+ "syn 2.0.103",
356	356	"which",
357	357	]
358	358
@@ -486,9 +486,9 @@ dependencies = [ · 127 unmodified lines
486	486
487	487	[[package]]
488	488	name = "cfg-if"
489		−version = "1.0.0"
	489	+version = "1.0.1"
490	490	source = "registry+https://github.com/rust-lang/crates.io-index"
491		−checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
	491	+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
492	492
493	493	[[package]]
494	494	name = "cfg_aliases"
@@ -574,7 +574,7 @@ dependencies = [ · 79 unmodified lines
574	574	"heck",
575	575	"proc-macro2",
576	576	"quote",
577		− "syn 2.0.101",
	577	+ "syn 2.0.103",
578	578	]
579	579
580	580	[[package]]
@@ -912,7 +912,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" · 331 unmodified lines
912	912	dependencies = [
913	913	"proc-macro2",
914	914	"quote",
915		− "syn 2.0.101",
	915	+ "syn 2.0.103",
916	916	]
917	917
918	918	[[package]]
@@ -939,7 +939,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" · 20 unmodified lines
939	939	dependencies = [
940	940	"proc-macro2",
941	941	"quote",
942		− "syn 2.0.101",
	942	+ "syn 2.0.103",
943	943	]
944	944
945	945	[[package]]
@@ -1097,9 +1097,9 @@ dependencies = [ · 151 unmodified lines
1097	1097
1098	1098	[[package]]
1099	1099	name = "flate2"
1100		−version = "1.1.1"
	1100	+version = "1.1.2"
1101	1101	source = "registry+https://github.com/rust-lang/crates.io-index"
1102		−checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
	1102	+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
1103	1103	dependencies = [
1104	1104	"crc32fast",
1105	1105	"libz-rs-sys",
@@ -1911,7 +1911,7 @@ version = "0.1.5" · 805 unmodified lines
1911	1911	dependencies = [
1912	1912	"proc-macro2",
1913	1913	"quote",
1914		− "syn 2.0.101",
	1914	+ "syn 2.0.103",
1915	1915	"trybuild",
1916	1916	]
1917	1917
@@ -3139,7 +3139,7 @@ checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442" · 1221 unmodified lines
3139	3139	dependencies = [
3140	3140	"proc-macro2",
3141	3141	"quote",
3142		− "syn 2.0.101",
	3142	+ "syn 2.0.103",
3143	3143	]
3144	3144
3145	3145	[[package]]
@@ -3293,9 +3293,9 @@ dependencies = [ · 147 unmodified lines
3293	3293
3294	3294	[[package]]
3295	3295	name = "libz-rs-sys"
3296		−version = "0.5.0"
	3296	+version = "0.5.1"
3297	3297	source = "registry+https://github.com/rust-lang/crates.io-index"
3298		−checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
	3298	+checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
3299	3299	dependencies = [
3300	3300	"zlib-rs",
3301	3301	]
@@ -3395,14 +3395,14 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" · 93 unmodified lines
3395	3395	dependencies = [
3396	3396	"proc-macro2",
3397	3397	"quote",
3398		− "syn 2.0.101",
	3398	+ "syn 2.0.103",
3399	3399	]
3400	3400
3401	3401	[[package]]
3402	3402	name = "memchr"
3403		−version = "2.7.4"
	3403	+version = "2.7.5"
3404	3404	source = "registry+https://github.com/rust-lang/crates.io-index"
3405		−checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
	3405	+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
3406	3406
3407	3407	[[package]]
3408	3408	name = "memmap2"
@@ -3436,9 +3436,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" · 27 unmodified lines
3436	3436
3437	3437	[[package]]
3438	3438	name = "miniz_oxide"
3439		−version = "0.8.8"
	3439	+version = "0.8.9"
3440	3440	source = "registry+https://github.com/rust-lang/crates.io-index"
3441		−checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
	3441	+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
3442	3442	dependencies = [
3443	3443	"adler2",
3444	3444	]
@@ -3633,7 +3633,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" · 188 unmodified lines
3633	3633	dependencies = [
3634	3634	"proc-macro2",
3635	3635	"quote",
3636		− "syn 2.0.101",
	3636	+ "syn 2.0.103",
3637	3637	]
3638	3638
3639	3639	[[package]]
@@ -3835,7 +3835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" · 195 unmodified lines
3835	3835	checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d"
3836	3836	dependencies = [
3837	3837	"proc-macro2",
3838		− "syn 2.0.101",
	3838	+ "syn 2.0.103",
3839	3839	]
3840	3840
3841	3841	[[package]]
@@ -4381,7 +4381,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" · 539 unmodified lines
4381	4381	dependencies = [
4382	4382	"proc-macro2",
4383	4383	"quote",
4384		− "syn 2.0.101",
	4384	+ "syn 2.0.103",
4385	4385	]
4386	4386
4387	4387	[[package]]
@@ -4439,7 +4439,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" · 51 unmodified lines
4439	4439	dependencies = [
4440	4440	"proc-macro2",
4441	4441	"quote",
4442		− "syn 2.0.101",
	4442	+ "syn 2.0.103",
4443	4443	]
4444	4444
4445	4445	[[package]]
@@ -4514,12 +4514,6 @@ dependencies = [ · 68 unmodified lines
4514	4514	"libc",
4515	4515	]
4516	4516
4517		−[[package]]
4518		−name = "simd-adler32"
4519		−version = "0.3.7"
4520		−source = "registry+https://github.com/rust-lang/crates.io-index"
4521		−checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
4522		−
4523	4517	[[package]]
4524	4518	name = "similar"
4525	4519	version = "2.7.0"
@@ -4561,7 +4555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" · 35 unmodified lines
4561	4555	checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
4562	4556	dependencies = [
4563	4557	"quote",
4564		− "syn 2.0.101",
	4558	+ "syn 2.0.103",
4565	4559	]
4566	4560
4567	4561	[[package]]
@@ -4601,7 +4595,7 @@ dependencies = [ · 33 unmodified lines
4601	4595	"proc-macro2",
4602	4596	"quote",
4603	4597	"rustversion",
4604		− "syn 2.0.101",
	4598	+ "syn 2.0.103",
4605	4599	]
4606	4600
4607	4601	[[package]]
@@ -4629,9 +4623,9 @@ dependencies = [ · 21 unmodified lines
4629	4623
4630	4624	[[package]]
4631	4625	name = "syn"
4632		−version = "2.0.101"
	4626	+version = "2.0.103"
4633	4627	source = "registry+https://github.com/rust-lang/crates.io-index"
4634		−checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
	4628	+checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
4635	4629	dependencies = [
4636	4630	"proc-macro2",
4637	4631	"quote",
@@ -4655,7 +4649,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" · 17 unmodified lines
4655	4649	dependencies = [
4656	4650	"proc-macro2",
4657	4651	"quote",
4658		− "syn 2.0.101",
	4652	+ "syn 2.0.103",
4659	4653	]
4660	4654
4661	4655	[[package]]
@@ -4774,7 +4768,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" · 112 unmodified lines
4774	4768	dependencies = [
4775	4769	"proc-macro2",
4776	4770	"quote",
4777		− "syn 2.0.101",
	4771	+ "syn 2.0.103",
4778	4772	]
4779	4773
4780	4774	[[package]]
@@ -4785,7 +4779,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" · 4 unmodified lines
4785	4779	dependencies = [
4786	4780	"proc-macro2",
4787	4781	"quote",
4788		− "syn 2.0.101",
	4782	+ "syn 2.0.103",
4789	4783	]
4790	4784
4791	4785	[[package]]
@@ -4986,7 +4980,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" · 194 unmodified lines
4986	4980	dependencies = [
4987	4981	"proc-macro2",
4988	4982	"quote",
4989		− "syn 2.0.101",
	4983	+ "syn 2.0.103",
4990	4984	]
4991	4985
4992	4986	[[package]]
@@ -5238,7 +5232,7 @@ dependencies = [ · 245 unmodified lines
5238	5232	"log",
5239	5233	"proc-macro2",
5240	5234	"quote",
5241		− "syn 2.0.101",
	5235	+ "syn 2.0.103",
5242	5236	"wasm-bindgen-shared",
5243	5237	]
5244	5238
@@ -5273,7 +5267,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" · 28 unmodified lines
5273	5267	dependencies = [
5274	5268	"proc-macro2",
5275	5269	"quote",
5276		− "syn 2.0.101",
	5270	+ "syn 2.0.103",
5277	5271	"wasm-bindgen-backend",
5278	5272	"wasm-bindgen-shared",
5279	5273	]
@@ -5430,7 +5424,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" · 150 unmodified lines
5430	5424	dependencies = [
5431	5425	"proc-macro2",
5432	5426	"quote",
5433		− "syn 2.0.101",
	5427	+ "syn 2.0.103",
5434	5428	]
5435	5429
5436	5430	[[package]]
@@ -5441,7 +5435,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" · 4 unmodified lines
5441	5435	dependencies = [
5442	5436	"proc-macro2",
5443	5437	"quote",
5444		− "syn 2.0.101",
	5438	+ "syn 2.0.103",
5445	5439	]
5446	5440
5447	5441	[[package]]
@@ -5769,9 +5763,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" · 321 unmodified lines
5769	5763
5770	5764	[[package]]
5771	5765	name = "winnow"
5772		−version = "0.7.10"
	5766	+version = "0.7.11"
5773	5767	source = "registry+https://github.com/rust-lang/crates.io-index"
5774		−checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
	5768	+checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
5775	5769	dependencies = [
5776	5770	"memchr",
5777	5771	]
@@ -5846,7 +5840,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" · 68 unmodified lines
5846	5840	dependencies = [
5847	5841	"proc-macro2",
5848	5842	"quote",
5849		− "syn 2.0.101",
	5843	+ "syn 2.0.103",
5850	5844	"synstructure",
5851	5845	]
5852	5846
@@ -5867,7 +5861,7 @@ checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" · 14 unmodified lines
5867	5861	dependencies = [
5868	5862	"proc-macro2",
5869	5863	"quote",
5870		− "syn 2.0.101",
	5864	+ "syn 2.0.103",
5871	5865	]
5872	5866
5873	5867	[[package]]
@@ -5887,7 +5881,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" · 13 unmodified lines
5887	5881	dependencies = [
5888	5882	"proc-macro2",
5889	5883	"quote",
5890		− "syn 2.0.101",
	5884	+ "syn 2.0.103",
5891	5885	"synstructure",
5892	5886	]
5893	5887
@@ -5927,37 +5921,24 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" · 33 unmodified lines
5927	5921	dependencies = [
5928	5922	"proc-macro2",
5929	5923	"quote",
5930		− "syn 2.0.101",
	5924	+ "syn 2.0.103",
5931	5925	]
5932	5926
5933	5927	[[package]]
5934	5928	name = "zip"
5935		−version = "4.0.0"
	5929	+version = "4.1.0"
5936	5930	source = "registry+https://github.com/rust-lang/crates.io-index"
5937		−checksum = "153a6fff49d264c4babdcfa6b4d534747f520e56e8f0f384f3b808c4b64cc1fd"
	5931	+checksum = "af7dcdb4229c0e79c2531a24de7726a0e980417a74fb4d030a35f535665439a0"
5938	5932	dependencies = [
5939	5933	"arbitrary",
5940	5934	"crc32fast",
5941	5935	"flate2",
5942	5936	"indexmap",
5943	5937	"memchr",
5944		− "zopfli",
5945	5938	]
5946	5939
5947	5940	[[package]]
5948	5941	name = "zlib-rs"
5949		−version = "0.5.0"
5950		−source = "registry+https://github.com/rust-lang/crates.io-index"
5951		−checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
5952		−
5953		−[[package]]
5954		−name = "zopfli"
5955		−version = "0.8.2"
	5942	+version = "0.5.1"
5956	5943	source = "registry+https://github.com/rust-lang/crates.io-index"
5957		−checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7"
5958		−dependencies = [
5959		− "bumpalo",
5960		− "crc32fast",
5961		− "log",
5962		− "simd-adler32",
5963		−]
	5944	+checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"

gix-archive/Cargo.toml+2−3

@@ -23,8 +23,7 @@ tar = ["dep:tar", "dep:gix-path"] · 22 unmodified lines
23	23	tar_gz = ["tar", "dep:flate2"]
24	24
25	25	## Enable the `zip` archive format.
26		−## This also enables the `flate2` dependency in order to enable `zlib-rs` on it.
27		−zip = ["dep:flate2", "dep:zip"]
	26	+zip = ["dep:zip"]
28	27
29	28
30	29	[dependencies]
@@ -34,7 +33,7 @@ gix-path = { version = "^0.10.18", path = "../gix-path", optional = true } · 3 unmodified lines
34	33	gix-date = { version = "^0.10.2", path = "../gix-date" }
35	34
36	35	flate2 = { version = "1.1.1", optional = true, default-features = false, features = ["zlib-rs"] }
37		−zip = { version = "4.0.0", optional = true, default-features = false, features = ["deflate"] }
	36	+zip = { version = "4.0.0", optional = true, default-features = false, features = ["deflate-flate2"] }
38	37	jiff = { version = "0.2.14", default-features = false, features = ["std"] }
39	38
40	39	thiserror = "2.0.0"

gix-archive/src/write.rs+1−1

@@ -176,7 +176,7 @@ fn append_zip_entry<W: std::io::Write + std::io::Seek>( · 175 unmodified lines
176	176	compression_level: Option<i64>,
177	177	tree_prefix: Option<&bstr::BString>,
178	178	) -> Result<(), Error> {
179		− let file_opts = zip::write::FileOptions::<'_, ()>::default()
	179	+ let file_opts = zip::write::SimpleFileOptions::default()
180	180	.compression_method(zip::CompressionMethod::Deflated)
181	181	.compression_level(compression_level)
182	182	.large_file(entry.bytes_remaining().map_or(true, \|len\| len > u32::MAX as usize))