diff --git a/native/src/Cargo.lock b/native/src/Cargo.lock index 0855c4ba0..8fb184602 100644 --- a/native/src/Cargo.lock +++ b/native/src/Cargo.lock @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "base16ct" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +checksum = "d8b59d472eab27ade8d770dcb11da7201c11234bef9f82ce7aa517be028d462b" [[package]] name = "base64ct" @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.11.0-rc.4" +version = "0.11.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a229bfd78e4827c91b9b95784f69492c1b77c1ab75a45a8a037b139215086f94" +checksum = "e9ef36a6fcdb072aa548f3da057640ec10859eb4e91ddf526ee648d50c76a949" dependencies = [ "hybrid-array", ] @@ -153,10 +153,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.34" +version = "1.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc" +checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54" dependencies = [ + "find-msvc-tools", "shlex", ] @@ -168,18 +169,18 @@ checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "clap" -version = "4.5.46" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57" +checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.46" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41" +checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" dependencies = [ "anstyle", "clap_lex", @@ -264,9 +265,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.7.0-pre.6" +version = "0.7.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98dc20cae677f0af161d98f18463804b680f9af060f6dbe6d4249bd7e838bca1" +checksum = "7c069823f41bdc75e99546bfd59eb1ed27d69dc720e5c949fe502b82926f8448" dependencies = [ "hybrid-array", "num-traits", @@ -288,9 +289,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.3" +version = "0.2.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be" +checksum = "6a8235645834fbc6832939736ce2f2d08192652269e11010a6240f61b908a1c6" dependencies = [ "hybrid-array", ] @@ -357,9 +358,9 @@ dependencies = [ [[package]] name = "der" -version = "0.8.0-rc.7" +version = "0.8.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2fe0a4fafae25053c19a03fefe040607bda956b4941d692ed9fb9d3c18a3193" +checksum = "7050e8041c28720851f7db83183195b6acf375bb7bb28e3b86f0fe6cbd69459d" dependencies = [ "const-oid", "der_derive", @@ -371,8 +372,7 @@ dependencies = [ [[package]] name = "der_derive" version = "0.8.0-rc.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14bfffadecb79dfde429f5dcd7553780c2cea5f7d0e72ad7c37a74f1ef79230a" +source = "git+https://github.com/RustCrypto/formats.git?rev=cfacd3efed49b28f38e69612221b8af5f33a5cbf#cfacd3efed49b28f38e69612221b8af5f33a5cbf" dependencies = [ "proc-macro2", "quote", @@ -400,24 +400,24 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.0-rc.0" +version = "0.11.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b" +checksum = "3a4aae35a0fcbe22ff1be50fe96df72002d5a4a6fb4aae9193cf2da0daa36da2" dependencies = [ - "block-buffer 0.11.0-rc.4", + "block-buffer 0.11.0-rc.5", "const-oid", - "crypto-common 0.2.0-rc.3", + "crypto-common 0.2.0-rc.4", "subtle", ] [[package]] name = "ecdsa" -version = "0.17.0-rc.5" +version = "0.17.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112839e868b3376c2066506d42331023165d687a7ed38b2ed77f28763d9a7742" +checksum = "a4aa27d88fe1d40a293286027c9306393094d9b36ccd91f2ac4d647870dc0042" dependencies = [ "der", - "digest 0.11.0-rc.0", + "digest 0.11.0-rc.1", "elliptic-curve", "rfc6979", "signature", @@ -427,13 +427,13 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.14.0-rc.10" +version = "0.14.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28ecec37eea07ab976cea93c7ce8b36d561cf161f6767925c1edc51024b0ad3" +checksum = "3b95fd42abd85018a59f5dbe05551e9eed19edfd1182a415cd98f90ca5af1422" dependencies = [ "base16ct", "crypto-bigint", - "digest 0.11.0-rc.0", + "digest 0.11.0-rc.1", "ff", "group", "hybrid-array", @@ -467,6 +467,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" + [[package]] name = "flagset" version = "0.4.7" @@ -531,18 +537,18 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" [[package]] name = "hmac" -version = "0.13.0-rc.0" +version = "0.13.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc6a2fcc35ab09136c6df2cdf9ca49790701420a3a6b5db0987dddbabc79b21" +checksum = "49e206bca159aebaaed410f5e78b2fe56bfc0dd5b19ecae922813b8556b8b07e" dependencies = [ - "digest 0.11.0-rc.0", + "digest 0.11.0-rc.1", ] [[package]] name = "hybrid-array" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891d15931895091dea5c47afa5b3c9a01ba634b311919fd4d41388fa0e3d76af" +checksum = "6fe39a812f039072707ce38020acbab2f769087952eddd9e2b890f37654b2349" dependencies = [ "typenum", "zeroize", @@ -578,18 +584,18 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libz-rs-sys" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221" +checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd" dependencies = [ "zlib-rs", ] [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "lz4" @@ -609,9 +615,9 @@ dependencies = [ [[package]] name = "lzma-rust2" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43aa8ef7ba6927e84cfb39120bbc06c29474346b956f7b88cc4899b1f2e86e" +checksum = "c60a23ffb90d527e23192f1246b14746e2f7f071cb84476dd879071696c18a4a" dependencies = [ "crc", "sha2 0.10.9", @@ -647,7 +653,7 @@ dependencies = [ "cxx", "cxx-gen", "der", - "digest 0.11.0-rc.0", + "digest 0.11.0-rc.1", "fdt", "flate2", "lz4", @@ -660,7 +666,7 @@ dependencies = [ "quick-protobuf", "rsa", "sha1", - "sha2 0.11.0-rc.0", + "sha2 0.11.0-rc.2", "size", "x509-cert", "zopfli", @@ -739,35 +745,35 @@ dependencies = [ [[package]] name = "p256" -version = "0.14.0-pre.9" +version = "0.14.0-pre.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be97a30a85c829fdac914cebb89ef05e109f9e5eb6510f46f623be91bc39ded" +checksum = "aa93e068b773d56fe26be53accf127d6eb0fde35e4116b7a9276db97b6a50ec9" dependencies = [ "ecdsa", "elliptic-curve", "primefield", "primeorder", - "sha2 0.11.0-rc.0", + "sha2 0.11.0-rc.2", ] [[package]] name = "p384" -version = "0.14.0-pre.9" +version = "0.14.0-pre.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9626bce3d0bf768a28778618e5095131cd32bfca5297b51bbcb4abe7fae62a" +checksum = "74d17e7d4276af996c6c52de52db4df6b676c5efc3a4269e56c9473edee1786d" dependencies = [ "ecdsa", "elliptic-curve", "primefield", "primeorder", - "sha2 0.11.0-rc.0", + "sha2 0.11.0-rc.2", ] [[package]] name = "p521" -version = "0.14.0-pre.9" +version = "0.14.0-pre.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1071ec0ddc9a8c198692acf5620176b0cd9c1db988acef030e101f851405f4" +checksum = "2a70f4308991bf35f1632d55155c3ca137f9ce05c6de00be51705bbaa3451cfe" dependencies = [ "base16ct", "ecdsa", @@ -775,7 +781,7 @@ dependencies = [ "primefield", "primeorder", "rand_core", - "sha2 0.11.0-rc.0", + "sha2 0.11.0-rc.2", ] [[package]] @@ -818,9 +824,9 @@ dependencies = [ [[package]] name = "primefield" -version = "0.14.0-pre.4" +version = "0.14.0-pre.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc85f9f75dc05486f61bc61858535c0501a0ca81ca3117ab17befbead13c110" +checksum = "049f40103b7e4b0da4e20ed8556805efa740f7104c48991c5f9ab8e09e10ee21" dependencies = [ "crypto-bigint", "ff", @@ -831,9 +837,9 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.14.0-pre.7" +version = "0.14.0-pre.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af12dd34fc62d04416de85af032f4595369437fb7b0143d36ae60cecaf5cdddf" +checksum = "9257332cf7e56fa8183f719977b92f1878cb1447275d0ee280a08bcd6fad158f" dependencies = [ "elliptic-curve", ] @@ -881,9 +887,9 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.5.0-rc.0" +version = "0.5.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f53f124bf3ec90be84ae97d7f52175ba938898525554c13c9017eb8f0a604146" +checksum = "d369f9c4f79388704648e7bcb92749c0d6cf4397039293a9b747694fa4fb4bae" dependencies = [ "hmac", "subtle", @@ -891,18 +897,18 @@ dependencies = [ [[package]] name = "rsa" -version = "0.10.0-rc.3" +version = "0.10.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8cb237ca3624409eda7d73de0d423815c9d91175ed5a62a8dd6549d2408cc2" +checksum = "12c09fc7922fb8b7de31cc809df908e30e0ed46eb33046c6e1e438ef8ec3466b" dependencies = [ "const-oid", "crypto-bigint", "crypto-primes", - "digest 0.11.0-rc.0", + "digest 0.11.0-rc.1", "pkcs1", "pkcs8", "rand_core", - "sha2 0.11.0-rc.0", + "sha2 0.11.0-rc.2", "signature", "spki", "subtle", @@ -923,9 +929,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "sec1" -version = "0.8.0-rc.8" +version = "0.8.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54dee398d74b1d03d78ddc09c90e456bf906b5b7aa790ba4f48b025b2179e5d" +checksum = "f5e67a3c9fb9a8f065af9fa30d65812fcc16a66cbf911eff1f6946957ce48f16" dependencies = [ "base16ct", "der", @@ -956,9 +962,9 @@ dependencies = [ [[package]] name = "serdect" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42f67da2385b51a5f9652db9c93d78aeaf7610bf5ec366080b6de810604af53" +checksum = "d3ef0e35b322ddfaecbc60f34ab448e157e48531288ee49fafbb053696b8ffe2" dependencies = [ "base16ct", "serde", @@ -966,13 +972,13 @@ dependencies = [ [[package]] name = "sha1" -version = "0.11.0-rc.0" +version = "0.11.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f9318facddf9ac32a33527066936837e189b3f23ced6edc1603720ead5e2b3d" +checksum = "c5e046edf639aa2e7afb285589e5405de2ef7e61d4b0ac1e30256e3eab911af9" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.11.0-rc.0", + "digest 0.11.0-rc.1", ] [[package]] @@ -988,13 +994,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.11.0-rc.0" +version = "0.11.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59" +checksum = "d1e3878ab0f98e35b2df35fe53201d088299b41a6bb63e3e34dada2ac4abd924" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.11.0-rc.0", + "digest 0.11.0-rc.1", ] [[package]] @@ -1005,11 +1011,11 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signature" -version = "3.0.0-rc.2" +version = "3.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4835c3b5ecb10171941a4998a95a3a76ecac1c5ae8e6954f2ad030acd1c7e8ab" +checksum = "39195ff4c0dc41c93e123825ca1f0d11b856df8b26d5fe140a522355632c4345" dependencies = [ - "digest 0.11.0-rc.0", + "digest 0.11.0-rc.1", "rand_core", ] @@ -1140,113 +1146,47 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" -version = "0.14.3+wasi-0.2.4" +version = "0.14.4+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95" +checksum = "88a5f4a424faf49c3c2c344f166f0662341d470ea185e939657aaff130f0ec4a" dependencies = [ "wit-bindgen", ] [[package]] name = "winapi-util" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ "windows-sys", ] [[package]] name = "windows-link" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-sys" -version = "0.60.2" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.53.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" dependencies = [ "windows-link", - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - [[package]] name = "wit-bindgen" -version = "0.45.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814" +checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36" [[package]] name = "x509-cert" version = "0.3.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015655a524ab1db259a56aaaec614cf84952299f4081c2602881d556e2ed2838" +source = "git+https://github.com/RustCrypto/formats.git?rev=cfacd3efed49b28f38e69612221b8af5f33a5cbf#cfacd3efed49b28f38e69612221b8af5f33a5cbf" dependencies = [ "const-oid", "der", @@ -1276,9 +1216,9 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a" +checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" [[package]] name = "zopfli" diff --git a/native/src/Cargo.toml b/native/src/Cargo.toml index 504f5d5ba..f09a349c1 100644 --- a/native/src/Cargo.toml +++ b/native/src/Cargo.toml @@ -31,23 +31,25 @@ flate2 = { version = "1.1.2", default-features = false } bzip2 = { version = "0.6.0" } zopfli = "0.8.2" lz4 = "1.28.1" -lzma-rust2 = { version = "0.11.0", default-features = false, features = ["xz", "std", "encoder", "optimization"] } +lzma-rust2 = { version = "0.13.0", default-features = false, features = ["xz", "std", "encoder", "optimization"] } # Rust crypto crates are tied together -sha1 = "0.11.0-rc.0" -sha2 = "0.11.0-rc.0" -digest = "0.11.0-rc.0" -p256 = "0.14.0-pre.9" -p384 = "0.14.0-pre.9" -p521 = "0.14.0-pre.9" -rsa = "=0.10.0-rc.3" +sha1 = "0.11.0-rc.2" +sha2 = "0.11.0-rc.2" +digest = "0.11.0-rc.1" +p256 = "0.14.0-pre.10" +p384 = "0.14.0-pre.10" +p521 = "0.14.0-pre.10" +rsa = "0.10.0-rc.6" x509-cert = "0.3.0-rc.1" -der = "=0.8.0-rc.7" +der = "0.8.0-rc.8" [patch.crates-io] pb-rs = { git = "https://github.com/tafia/quick-protobuf.git" } quick-protobuf = { git = "https://github.com/tafia/quick-protobuf.git" } lz4-sys = { path = "external/lz4-sys" } +x509-cert = { git = "https://github.com/RustCrypto/formats.git", rev = "cfacd3efed49b28f38e69612221b8af5f33a5cbf" } +der_derive = { git = "https://github.com/RustCrypto/formats.git", rev = "cfacd3efed49b28f38e69612221b8af5f33a5cbf" } [profile.dev] opt-level = "z" diff --git a/native/src/boot/compress.rs b/native/src/boot/compress.rs index f5a1a57ed..c9667ed6a 100644 --- a/native/src/boot/compress.rs +++ b/native/src/boot/compress.rs @@ -9,7 +9,7 @@ use lz4::{ BlockMode, BlockSize, ContentChecksum, Decoder as LZ4FrameDecoder, Encoder as LZ4FrameEncoder, EncoderBuilder as LZ4FrameEncoderBuilder, block::CompressionMode, liblz4::BlockChecksum, }; -use lzma_rust2::{CheckType, LZMAOptions, LZMAReader, LZMAWriter, XZOptions, XZReader, XZWriter}; +use lzma_rust2::{CheckType, LzmaOptions, LzmaReader, LzmaWriter, XzOptions, XzReader, XzWriter}; use std::cmp::min; use std::fmt::Write as FmtWrite; use std::fs::File; @@ -36,7 +36,7 @@ macro_rules! finish_impl { )*} } -finish_impl!(GzEncoder, BzEncoder, XZWriter, LZMAWriter); +finish_impl!(GzEncoder, BzEncoder, XzWriter, LzmaWriter); impl WriteFinish for BufWriter> { fn finish(self: Box) -> std::io::Result { @@ -215,12 +215,12 @@ impl Read for LZ4BlockDecoder { pub fn get_encoder<'a, W: Write + 'a>(format: FileFormat, w: W) -> Box + 'a> { match format { FileFormat::XZ => { - let mut opt = XZOptions::with_preset(9); + let mut opt = XzOptions::with_preset(9); opt.set_check_sum_type(CheckType::Crc32); - Box::new(XZWriter::new(w, opt).unwrap()) + Box::new(XzWriter::new(w, opt).unwrap()) } FileFormat::LZMA => { - Box::new(LZMAWriter::new_use_header(w, &LZMAOptions::with_preset(9), None).unwrap()) + Box::new(LzmaWriter::new_use_header(w, &LzmaOptions::with_preset(9), None).unwrap()) } FileFormat::BZIP2 => Box::new(BzEncoder::new(w, BzCompression::best())), FileFormat::LZ4 => { @@ -253,8 +253,8 @@ pub fn get_encoder<'a, W: Write + 'a>(format: FileFormat, w: W) -> Box(format: FileFormat, r: R) -> Box { match format { - FileFormat::XZ => Box::new(XZReader::new(r, true)), - FileFormat::LZMA => Box::new(LZMAReader::new_mem_limit(r, u32::MAX, None).unwrap()), + FileFormat::XZ => Box::new(XzReader::new(r, true)), + FileFormat::LZMA => Box::new(LzmaReader::new_mem_limit(r, u32::MAX, None).unwrap()), FileFormat::BZIP2 => Box::new(BzDecoder::new(r)), FileFormat::LZ4 => Box::new(LZ4FrameDecoder::new(r).unwrap()), FileFormat::LZ4_LG | FileFormat::LZ4_LEGACY => Box::new(LZ4BlockDecoder::new(r)),